moves files around and refactoring