Refactoring file hierarchy.