Updating build to support new project structure