Reorganisation

I have started to tidy up the modules and classes to try and make it clearer what should be doing which job. I've also been having a general code clean up in order to get a better release out and to help highlight what still needs to be done.