Restructuring root folder