Change file structure ready for refactoring