Develop

Moved a lot of functionality into modules and away from the core