Reorganize the structure of the files