Major rearrangement of files