Rebuilt project structure