Restructured the project structure