Small reorganization of files