Refactor file structures.