Restructuring the folders tree