Change project structure to allow adding more subprojects