Refactoring file structure.