Move remaining pieces of the build to new scheme