Breaking out classes into seperate files
Merge branch 'FileCleanup'