Large restructuring of files