diff --git a/.gitignore b/.gitignore
index 7770dd90..8ba9773b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /cgcs-centos-repo
 /cgcs-tis-repo
 /cgcs-3rd-party-repo
+/stx
diff --git a/build-tools/build-guest b/build-tools/build-guest
index 6c26f914..bdd0964e 100755
--- a/build-tools/build-guest
+++ b/build-tools/build-guest
@@ -83,12 +83,14 @@ function check_vars {
       exit 1
    fi
 
+   STX_DIR=$INTERNAL_REPO_ROOT/stx
+
    if [ "x$MY_BUILD_CFG" == "x" ];then
        printf "  Error -- reqiure MY_BUILD_CFG to be defined.\n"
        exit 1
    fi
 
-   RELEASE_INFO=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   RELEASE_INFO=$STX_DIR/middleware/recipes-common/build-info/release-info.inc
    export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
 }
 
diff --git a/build-tools/build-img b/build-tools/build-img
index 84f3f2a7..ec43165f 100755
--- a/build-tools/build-img
+++ b/build-tools/build-img
@@ -51,9 +51,11 @@ fi
 
 # Step 2: Convert the ISO to IMG
 if [ $PART -ne 1 ]; then
+   INSTALL_ISO_TO_DISK_IMAGE=$MY_REPO/stx/extras.ND/scripts/install_iso_to_disk_image.sh
+
    if [ ! -e "/dev/loop-control"  -o ! -e "/dev/kvm" ]; then
       CMD="cd $MY_WORKSPACE/export; \
-           $MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG"
+           $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG"
 
       if [ "$HOSTNAME" == "yow-cgts3-centos7" ]; then
          echo "Attempting to run kvm_iso_to_img on yow-cgts3-lx"
@@ -77,7 +79,7 @@ if [ $PART -ne 1 ]; then
          printf "No kvm and/or loop device on this machine.  To complete the build \n"
          printf "please copy '$MY_WORKSPACE/export/bootimage_auto.iso' to a machine \n"
          printf "that supports kvm and loop devices and run ... \n"
-         printf "   $MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG\n"
+         printf "   $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG\n"
          printf "****************************************************************** \n"
          exit 1
       fi
@@ -86,7 +88,7 @@ if [ $PART -ne 1 ]; then
    if [ ! -f "$MY_WORKSPACE/export/$DEST_IMG" ]; then
       (
       cd $MY_WORKSPACE/export
-      $MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG
+      $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG
       exit $?
       )
    fi
diff --git a/build-tools/build-iso b/build-tools/build-iso
index 9ef0c0ea..6f3e5a1e 100755
--- a/build-tools/build-iso
+++ b/build-tools/build-iso
@@ -129,6 +129,7 @@ function init_vars {
    # Where all CentOS packages live
    # Where essential CentOS (minimal install) packages live
    INTERNAL_REPO_ROOT=
+   STX_DIR=
 
    # Where BSP files live
    export BSP_FILES_PATH=
@@ -219,6 +220,8 @@ function check_vars {
       exit 1
    fi
 
+   STX_DIR=$INTERNAL_REPO_ROOT/stx
+
    printf "\nChecking that we can access $DISTRO_REPO_DIR\n"
    if [ ! -d "$DISTRO_REPO_DIR" ] ; then
       printf "  Error -- could not access $DISTRO_REPO_DIR\n"
@@ -249,11 +252,11 @@ function check_vars {
       exit 1
    fi
 
-   RELEASE_INFO=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   RELEASE_INFO=$STX_DIR/middleware/recipes-common/build-info/release-info.inc
    export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
 
    # Where BSP files live
-   export BSP_FILES_PATH="$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/stx-metal/bsp-files"
+   export BSP_FILES_PATH="$STX_DIR/stx-metal/bsp-files"
 
    echo "  Done"
    echo ""
@@ -461,7 +464,6 @@ function extract_pkg_from_local_repo {
 function extract_installer_files {
    # Changes to copied files here must also be reflected in patch-iso
 
-   CGCSDIR=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs
    PKGDIR=$OUTPUT_DIST_DIR/isolinux/Packages
 
    (
diff --git a/build-tools/build-rpms-parallel b/build-tools/build-rpms-parallel
index 134388e6..3ae6bf81 100755
--- a/build-tools/build-rpms-parallel
+++ b/build-tools/build-rpms-parallel
@@ -1486,6 +1486,7 @@ export BUILD_BASE="$BUILD_ROOT"
 export CCACHE_DIR="$BUILD_ROOT/.ccache"
 export RESULT_DIR="$BUILD_BASE/results"
 export SRC_BASE="$SRC_ROOT"
+export STX_BASE=$SRC_BASE/stx
 
 if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then
     RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR
@@ -1493,9 +1494,9 @@ else
     RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild
 fi
 
-RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
 if [ -f $RELEASE_INFO_FILE ]; then
-   source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   source $RELEASE_INFO_FILE
 else
    echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
    exit 1
diff --git a/build-tools/build-rpms-serial b/build-tools/build-rpms-serial
index 0cf290bf..0c687977 100755
--- a/build-tools/build-rpms-serial
+++ b/build-tools/build-rpms-serial
@@ -583,6 +583,7 @@ export BUILD_BASE="$BUILD_ROOT"
 export CCACHE_DIR="$BUILD_ROOT/.ccache"
 export RESULT_DIR="$BUILD_BASE/results"
 export SRC_BASE="$SRC_ROOT"
+export STX_BASE=$SRC_BASE/stx
 
 if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then
     RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR
@@ -590,9 +591,9 @@ else
     RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild
 fi
 
-RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
 if [ -f $RELEASE_INFO_FILE ]; then
-   source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   source $RELEASE_INFO_FILE
 else
    echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
    exit 1
diff --git a/build-tools/build-srpms-parallel b/build-tools/build-srpms-parallel
index 1b6f8c6a..0a374632 100755
--- a/build-tools/build-srpms-parallel
+++ b/build-tools/build-srpms-parallel
@@ -222,8 +222,8 @@ fi
 
 export CCACHE_DIR="$BUILD_ROOT/.ccache"
 export SRC_BASE="$SRC_ROOT"
-export CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs"
-export STX_BASE="$CGCS_BASE"
+export STX_BASE="$SRC_BASE/stx"
+export CGCS_BASE="$STX_BASE"
 export SPECS_BASE="$ORIG_SPECS_PATH"
 export FILES_BASE="$FILES_PATH"
 export PATCHES_BASE="$PATCHES_PATH"
@@ -256,9 +256,9 @@ if [ ! -d $BUILD_BASE ]; then
    exit 1
 fi
 
-RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
 if [ -f $RELEASE_INFO_FILE ]; then
-   source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   source $RELEASE_INFO_FILE
 else
    echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
    exit 1
diff --git a/build-tools/build-srpms-serial b/build-tools/build-srpms-serial
index 0876ba5c..e9704eb5 100755
--- a/build-tools/build-srpms-serial
+++ b/build-tools/build-srpms-serial
@@ -208,8 +208,8 @@ fi
 
 export CCACHE_DIR="$BUILD_ROOT/.ccache"
 export SRC_BASE="$SRC_ROOT"
-export CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs"
-export STX_BASE="$CGCS_BASE"
+export STX_BASE="$SRC_BASE/stx"
+export CGCS_BASE="$STX_BASE"
 export SPECS_BASE="$ORIG_SPECS_PATH"
 export FILES_BASE="$FILES_PATH"
 export PATCHES_BASE="$PATCHES_PATH"
@@ -241,9 +241,9 @@ if [ ! -d $BUILD_BASE ]; then
    exit 1
 fi
 
-RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
 if [ -f $RELEASE_INFO_FILE ]; then
-   source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+   source $RELEASE_INFO_FILE
 else
    echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
    exit 1
diff --git a/build-tools/modify-build-cfg b/build-tools/modify-build-cfg
index d7625756..26694a6c 100755
--- a/build-tools/modify-build-cfg
+++ b/build-tools/modify-build-cfg
@@ -116,7 +116,7 @@ done
 # okay, now we have lines for each env var.  Generate the correct values
 
 BUILD_DATE=`date "+%F %T %z"`
-CGCS_GIT_BRANCH=`cd $MY_REPO/addons/wr-cgcs/layers/cgcs/; git rev-parse --abbrev-ref HEAD`
+CGCS_GIT_BRANCH=`cd $MY_REPO/stx/; git rev-parse --abbrev-ref HEAD`
 WRS_GIT_BRANCH=`cd $MY_REPO; git rev-parse --abbrev-ref HEAD`
 REPO=$MY_REPO
 
diff --git a/build-tools/patch-iso b/build-tools/patch-iso
index 3ead5974..21ebcc0d 100755
--- a/build-tools/patch-iso
+++ b/build-tools/patch-iso
@@ -8,14 +8,15 @@ if [ -z "${MY_REPO}" ]; then
     exit 1
 fi
 
-SETUP_PATCH_REPO=${MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/setup_patch_repo.sh
+STX_DIR=${MY_REPO}/stx
+SETUP_PATCH_REPO=${STX_DIR}/extras.ND/scripts/setup_patch_repo.sh
 if [ ! -x ${SETUP_PATCH_REPO} ]; then
     echo "Cannot find or execute ${SETUP_PATCH_REPO}"
     exit 1
 fi
 
-REPO_UPGRADES_DIR=${MY_REPO}/addons/wr-cgcs/layers/cgcs/common-bsp/files/upgrades
-RELEASE_INFO=${MY_REPO}/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+REPO_UPGRADES_DIR=${STX_DIR}/common-bsp/files/upgrades
+RELEASE_INFO=${STX_DIR}/middleware/recipes-common/build-info/release-info.inc
 PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
 
 function usage() {
diff --git a/build-tools/patch_rebase_1 b/build-tools/patch_rebase_1
index cdf2018c..bd7b448d 100755
--- a/build-tools/patch_rebase_1
+++ b/build-tools/patch_rebase_1
@@ -18,7 +18,7 @@ usage () {
     echo "  PKG=lighttpd"
     echo "  OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
     echo "  NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
-    echo "  SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path"
+    echo "  SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
     echo "  echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
     echo ""
 }
diff --git a/build-tools/patch_rebase_2 b/build-tools/patch_rebase_2
index ddcd1e5f..f0fd5965 100755
--- a/build-tools/patch_rebase_2
+++ b/build-tools/patch_rebase_2
@@ -18,7 +18,7 @@ usage () {
     echo "  PKG=lighttpd"
     echo "  OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
     echo "  NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
-    echo "  SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path"
+    echo "  SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
     echo "  echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
     echo ""
 }
diff --git a/build-tools/patch_rebase_3 b/build-tools/patch_rebase_3
index b6bb66c2..11994b0b 100755
--- a/build-tools/patch_rebase_3
+++ b/build-tools/patch_rebase_3
@@ -18,7 +18,7 @@ usage () {
     echo "  PKG=lighttpd"
     echo "  OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
     echo "  NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
-    echo "  SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path"
+    echo "  SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
     echo "  echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
     echo ""
 }
diff --git a/build-tools/patch_rebase_4 b/build-tools/patch_rebase_4
index 96c469f0..537ed0ba 100755
--- a/build-tools/patch_rebase_4
+++ b/build-tools/patch_rebase_4
@@ -18,7 +18,7 @@ usage () {
     echo "  PKG=lighttpd"
     echo "  OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
     echo "  NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
-    echo "  SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path"
+    echo "  SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
     echo "  echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
     echo ""
 }