Fixes to the project structure