last pieces for our new project structure