Rather massive re-division of the file structure.