Reorganize the files tree