Break major classes out into separate files
Rename main file