Refactoring classes out