Some reorganization of files