Restructuring the folder