Restructured the project space