Reorganization file structure