Moved all the classes to a more central location