Re-organising the project structure