Enhance project structure