upgraded project structure