Reorganization of some files