Reformat file structure