Fixes to project structure