refactoring class names, moving files around