Organized classes into their own files

No functional changes