project structure fixed