Restructured the project in subprojects to finish this first step of work and start testing