Now builds in the new project structure