Files reorganization