Tidy up logical file structure.