Restructuring the project folders