More rearrangement of files and directories.