Restructuring the folder structure