Some rearrangement of files