Fixing the build goals

That were broken by dir changes.