Reorganization of some files.