project structure revised