Reordered the classes so that all classes are in seperate files