Refactoring out all the classes