Reorganization of file structure