Refactor file structure.