Further reorganization of files.