Moved all classes into own files