Restructured the project directories