Fixed: Moved more classes into their own files.