More on new project structure