Refactor file structure