further rearrangement of files

further rearrangement of files