rebuilt project structure