Restructuring the folders.