Upgraded project structure