Started moving some things around.
Moved out main classes into their own files.