Modularize all the things! 

Each class has its own file.
I'd like to move to unit testing classes as required, hopefully this will be a good first step.

Also, I'd like to think that ST3 support will be slightly easier.