refactor file structure.