Modify the organization of some files