Use correct project structure