slight rearrangement of files