Updates to build scripts to put artifacts in sub-directory