Further reorganization of the files.