Restructured the project folder layout