Restructured the structure of the top most folders in the project