More tweaking to the initial project structure