Moving classes into their own files to make the code cleaner.