Refactoring and moving files