Folders and files restructuring