This split still requires some work as the tests currently fail. This is caused by the fact that some previously private modules can't be accessed anymore, and that Rocket changet it's testing framework.
