diff --git a/Makefile b/Makefile
index fbd5d511b9..f0a8c9c012 100644
--- a/Makefile
+++ b/Makefile
@@ -273,7 +273,7 @@ clean:
 	@echo "$$CLEAN_HELP_INFO"
 else
 clean: clean_meta
-	build-tools/make-clean.sh
+	build/make-clean.sh
 	rm -rf $(OUT_DIR)
 	rm -rf Godeps/_workspace # Just until we are sure it is gone
 endif
@@ -342,7 +342,7 @@ release:
 	@echo "$$RELEASE_HELP_INFO"
 else
 release:
-	build-tools/release.sh
+	build/release.sh
 endif
 
 define RELEASE_SKIP_TESTS_HELP_INFO
@@ -357,7 +357,7 @@ release-skip-tests quick-release:
 	@echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
 else
 release-skip-tests quick-release:
-	KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build-tools/release.sh
+	KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build/release.sh
 endif
 
 define CROSS_HELP_INFO
diff --git a/build-tools/BUILD b/build/BUILD
similarity index 100%
rename from build-tools/BUILD
rename to build/BUILD
diff --git a/build-tools/OWNERS b/build/OWNERS
similarity index 100%
rename from build-tools/OWNERS
rename to build/OWNERS
diff --git a/build-tools/README.md b/build/README.md
similarity index 75%
rename from build-tools/README.md
rename to build/README.md
index d34f67cbcd..575b061f0a 100644
--- a/build-tools/README.md
+++ b/build/README.md
@@ -19,21 +19,21 @@ While it is possible to build Kubernetes using a local golang installation, we h
 
 ## Key scripts
 
-The following scripts are found in the `build-tools/` directory. Note that all scripts must be run from the Kubernetes root directory.
+The following scripts are found in the `build/` directory. Note that all scripts must be run from the Kubernetes root directory.
 
-* `build-tools/run.sh`: Run a command in a build docker container.  Common invocations:
-  *  `build-tools/run.sh make`: Build just linux binaries in the container.  Pass options and packages as necessary.
-  *  `build-tools/run.sh make cross`: Build all binaries for all platforms
-  *  `build-tools/run.sh make test`: Run all unit tests
-  *  `build-tools/run.sh make test-integration`: Run integration test
-  *  `build-tools/run.sh make test-cmd`: Run CLI tests
-* `build-tools/copy-output.sh`: This will copy the contents of `_output/dockerized/bin` from the Docker container to the local `_output/dockerized/bin`. It will also copy out specific file patterns that are generated as part of the build process. This is run automatically as part of `build-tools/run.sh`.
-* `build-tools/make-clean.sh`: Clean out the contents of `_output`, remove any locally built container images and remove the data container.
-* `/build-tools/shell.sh`: Drop into a `bash` shell in a build container with a snapshot of the current repo code.
+* `build/run.sh`: Run a command in a build docker container.  Common invocations:
+  *  `build/run.sh make`: Build just linux binaries in the container.  Pass options and packages as necessary.
+  *  `build/run.sh make cross`: Build all binaries for all platforms
+  *  `build/run.sh make test`: Run all unit tests
+  *  `build/run.sh make test-integration`: Run integration test
+  *  `build/run.sh make test-cmd`: Run CLI tests
+* `build/copy-output.sh`: This will copy the contents of `_output/dockerized/bin` from the Docker container to the local `_output/dockerized/bin`. It will also copy out specific file patterns that are generated as part of the build process. This is run automatically as part of `build/run.sh`.
+* `build/make-clean.sh`: Clean out the contents of `_output`, remove any locally built container images and remove the data container.
+* `/build/shell.sh`: Drop into a `bash` shell in a build container with a snapshot of the current repo code.
 
 ## Basic Flow
 
-The scripts directly under `build-tools/` are used to build and test.  They will ensure that the `kube-build` Docker image is built (based on `build-tools/build-image/Dockerfile`) and then execute the appropriate command in that container.  These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container.
+The scripts directly under `build/` are used to build and test.  They will ensure that the `kube-build` Docker image is built (based on `build/build-image/Dockerfile`) and then execute the appropriate command in that container.  These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container.
 
 The `kube-build` container image is built by first creating a "context" directory in `_output/images/build-image`.  It is done there instead of at the root of the Kubernetes repo to minimize the amount of data we need to package up when building the image.
 
@@ -92,7 +92,7 @@ Look at `docker-machine stop`, `docker-machine start` and `docker-machine rm` to
 
 ## Releasing
 
-The `build-tools/release.sh` script will build a release.  It will build binaries, run tests, (optionally) build runtime Docker images.
+The `build/release.sh` script will build a release.  It will build binaries, run tests, (optionally) build runtime Docker images.
 
 The main output is a tar file: `kubernetes.tar.gz`.  This includes:
 * Cross compiled client utilities.
@@ -109,4 +109,4 @@ In addition, there are some other tar files that are created:
 
 When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`.
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/README.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/README.md?pixel)]()
diff --git a/build-tools/build-image/Dockerfile b/build/build-image/Dockerfile
similarity index 100%
rename from build-tools/build-image/Dockerfile
rename to build/build-image/Dockerfile
diff --git a/build-tools/build-image/VERSION b/build/build-image/VERSION
similarity index 100%
rename from build-tools/build-image/VERSION
rename to build/build-image/VERSION
diff --git a/build-tools/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
similarity index 100%
rename from build-tools/build-image/cross/Dockerfile
rename to build/build-image/cross/Dockerfile
diff --git a/build-tools/build-image/cross/Makefile b/build/build-image/cross/Makefile
similarity index 100%
rename from build-tools/build-image/cross/Makefile
rename to build/build-image/cross/Makefile
diff --git a/build-tools/build-image/cross/VERSION b/build/build-image/cross/VERSION
similarity index 100%
rename from build-tools/build-image/cross/VERSION
rename to build/build-image/cross/VERSION
diff --git a/build-tools/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch b/build/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch
similarity index 100%
rename from build-tools/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch
rename to build/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch
diff --git a/build-tools/build-image/rsyncd.sh b/build/build-image/rsyncd.sh
similarity index 100%
rename from build-tools/build-image/rsyncd.sh
rename to build/build-image/rsyncd.sh
diff --git a/build-tools/cni/Makefile b/build/cni/Makefile
similarity index 100%
rename from build-tools/cni/Makefile
rename to build/cni/Makefile
diff --git a/build-tools/common.sh b/build/common.sh
similarity index 98%
rename from build-tools/common.sh
rename to build/common.sh
index 5e22c126ea..70b3d77137 100755
--- a/build-tools/common.sh
+++ b/build/common.sh
@@ -41,15 +41,15 @@ readonly KUBE_BUILD_PPC64LE="${KUBE_BUILD_PPC64LE:-n}"
 
 # Constants
 readonly KUBE_BUILD_IMAGE_REPO=kube-build
-readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat ${KUBE_ROOT}/build-tools/build-image/cross/VERSION)"
+readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat ${KUBE_ROOT}/build/build-image/cross/VERSION)"
 
 # This version number is used to cause everyone to rebuild their data containers
 # and build image.  This is especially useful for automated build systems like
 # Jenkins.
 #
 # Increment/change this number if you change the build image (anything under
-# build-tools/build-image) or change the set of volumes in the data container.
-readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build-tools/build-image/VERSION)"
+# build/build-image) or change the set of volumes in the data container.
+readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build/build-image/VERSION)"
 readonly KUBE_BUILD_IMAGE_VERSION="${KUBE_BUILD_IMAGE_VERSION_BASE}-${KUBE_BUILD_IMAGE_CROSS_TAG}"
 
 # Here we map the output directories across both the local and remote _output
@@ -428,8 +428,8 @@ function kube::build::build_image() {
 
   cp /etc/localtime "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
 
-  cp build-tools/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
-  cp build-tools/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
+  cp build/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
+  cp build/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
   dd if=/dev/urandom bs=512 count=1 2>/dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | dd bs=32 count=1 2>/dev/null > "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
   chmod go= "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
 
@@ -646,7 +646,7 @@ function kube::build::start_rsyncd_container() {
     return 0
   fi
 
-  kube::log::error "Could not connect to rsync container. See build-tools/README.md for setting up remote Docker engine."
+  kube::log::error "Could not connect to rsync container. See build/README.md for setting up remote Docker engine."
   return 1
 }
 
diff --git a/build-tools/copy-output.sh b/build/copy-output.sh
similarity index 94%
rename from build-tools/copy-output.sh
rename to build/copy-output.sh
index 4904ebacba..c4429cfbf0 100755
--- a/build-tools/copy-output.sh
+++ b/build/copy-output.sh
@@ -20,7 +20,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/build-tools/common.sh"
+source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs
 kube::build::copy_output
diff --git a/build-tools/debian-iptables/Dockerfile b/build/debian-iptables/Dockerfile
similarity index 100%
rename from build-tools/debian-iptables/Dockerfile
rename to build/debian-iptables/Dockerfile
diff --git a/build-tools/debian-iptables/Makefile b/build/debian-iptables/Makefile
similarity index 100%
rename from build-tools/debian-iptables/Makefile
rename to build/debian-iptables/Makefile
diff --git a/build-tools/debian-iptables/README.md b/build/debian-iptables/README.md
similarity index 94%
rename from build-tools/debian-iptables/README.md
rename to build/debian-iptables/README.md
index c10eaa7cba..f5c0b3c7e0 100644
--- a/build-tools/debian-iptables/README.md
+++ b/build/debian-iptables/README.md
@@ -29,4 +29,4 @@ $ make push ARCH=s390x
 If you don't want to push the images, run `make` or `make build` instead
 
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/debian-iptables/README.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/debian-iptables/README.md?pixel)]()
diff --git a/build-tools/kube-dns/CHANGELOG.md b/build/kube-dns/CHANGELOG.md
similarity index 95%
rename from build-tools/kube-dns/CHANGELOG.md
rename to build/kube-dns/CHANGELOG.md
index 9756b69840..891bdc2690 100644
--- a/build-tools/kube-dns/CHANGELOG.md
+++ b/build/kube-dns/CHANGELOG.md
@@ -23,4 +23,4 @@
 - First Changelog entry
 
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/CHANGELOG.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/CHANGELOG.md?pixel)]()
diff --git a/build-tools/kube-dns/Dockerfile b/build/kube-dns/Dockerfile
similarity index 100%
rename from build-tools/kube-dns/Dockerfile
rename to build/kube-dns/Dockerfile
diff --git a/build-tools/kube-dns/MAINTAINERS.md b/build/kube-dns/MAINTAINERS.md
similarity index 67%
rename from build-tools/kube-dns/MAINTAINERS.md
rename to build/kube-dns/MAINTAINERS.md
index 57a81b55de..8e16d51663 100644
--- a/build-tools/kube-dns/MAINTAINERS.md
+++ b/build/kube-dns/MAINTAINERS.md
@@ -2,4 +2,4 @@
 
 Tim Hockin <thockin@google.com>
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/MAINTAINERS.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/MAINTAINERS.md?pixel)]()
diff --git a/build-tools/kube-dns/Makefile b/build/kube-dns/Makefile
similarity index 96%
rename from build-tools/kube-dns/Makefile
rename to build/kube-dns/Makefile
index c18ec62e60..1eb1d16191 100644
--- a/build-tools/kube-dns/Makefile
+++ b/build/kube-dns/Makefile
@@ -51,7 +51,7 @@ all: container
 container:
 	# Copy the content in this dir to the temp dir
 	cp $(KUBE_ROOT)/_output/dockerized/bin/$(PLATFORM)/$(ARCH)/kube-dns $(TEMP_DIR)
-	cp $(KUBE_ROOT)/build-tools/kube-dns/Dockerfile $(TEMP_DIR)
+	cp $(KUBE_ROOT)/build/kube-dns/Dockerfile $(TEMP_DIR)
 
 	# Replace BASEIMAGE with the real base image
 	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
diff --git a/build-tools/kube-dns/OWNERS b/build/kube-dns/OWNERS
similarity index 100%
rename from build-tools/kube-dns/OWNERS
rename to build/kube-dns/OWNERS
diff --git a/build-tools/kube-dns/README.md b/build/kube-dns/README.md
similarity index 95%
rename from build-tools/kube-dns/README.md
rename to build/kube-dns/README.md
index 60a5f81fdd..63d7e34bcd 100644
--- a/build-tools/kube-dns/README.md
+++ b/build/kube-dns/README.md
@@ -19,4 +19,4 @@ Any significant changes to the YAML template for `kube-dns` should result a bump
 of the version number for the `kube-dns` replication controller and well as the
 `version` label. This will permit a rolling update of `kube-dns`.
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/README.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/README.md?pixel)]()
diff --git a/build-tools/kube-dns/RELEASES.md b/build/kube-dns/RELEASES.md
similarity index 94%
rename from build-tools/kube-dns/RELEASES.md
rename to build/kube-dns/RELEASES.md
index 4a62744b4c..264a2e09d2 100644
--- a/build-tools/kube-dns/RELEASES.md
+++ b/build/kube-dns/RELEASES.md
@@ -8,7 +8,7 @@ are ready, not on every PR.
 
 ```
 make release
-cd build-tools/kube-dns
+cd build/kube-dns
 make container PREFIX=<your-docker-hub> TAG=rc
 ```
 
@@ -48,4 +48,4 @@ make container PREFIX=<your-docker-hub> TAG=rc
 8. Allow the PR to be merged.
 
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/RELEASES.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/RELEASES.md?pixel)]()
diff --git a/build-tools/lib/release.sh b/build/lib/release.sh
similarity index 100%
rename from build-tools/lib/release.sh
rename to build/lib/release.sh
diff --git a/build-tools/make-build-image.sh b/build/make-build-image.sh
similarity index 95%
rename from build-tools/make-build-image.sh
rename to build/make-build-image.sh
index bd836c1968..d4b69605c6 100755
--- a/build-tools/make-build-image.sh
+++ b/build/make-build-image.sh
@@ -25,7 +25,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
-source "${KUBE_ROOT}/build-tools/common.sh"
+source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs
 kube::build::build_image
diff --git a/build-tools/make-clean.sh b/build/make-clean.sh
similarity index 94%
rename from build-tools/make-clean.sh
rename to build/make-clean.sh
index 36a391730f..8d82dfaaf0 100755
--- a/build-tools/make-clean.sh
+++ b/build/make-clean.sh
@@ -20,7 +20,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/build-tools/common.sh"
+source "${KUBE_ROOT}/build/common.sh"
 
 kube::build::verify_prereqs false
 kube::build::clean
diff --git a/build-tools/pause/.gitignore b/build/pause/.gitignore
similarity index 100%
rename from build-tools/pause/.gitignore
rename to build/pause/.gitignore
diff --git a/build-tools/pause/Dockerfile b/build/pause/Dockerfile
similarity index 100%
rename from build-tools/pause/Dockerfile
rename to build/pause/Dockerfile
diff --git a/build-tools/pause/Makefile b/build/pause/Makefile
similarity index 100%
rename from build-tools/pause/Makefile
rename to build/pause/Makefile
diff --git a/build-tools/pause/pause.c b/build/pause/pause.c
similarity index 100%
rename from build-tools/pause/pause.c
rename to build/pause/pause.c
diff --git a/build-tools/push-federation-images.sh b/build/push-federation-images.sh
similarity index 95%
rename from build-tools/push-federation-images.sh
rename to build/push-federation-images.sh
index df4e996824..3ebf7d4dce 100755
--- a/build-tools/push-federation-images.sh
+++ b/build/push-federation-images.sh
@@ -22,7 +22,7 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
-source "${KUBE_ROOT}/build-tools/util.sh"
+source "${KUBE_ROOT}/build/util.sh"
 
 source "${KUBE_ROOT}/federation/cluster/common.sh"
 
diff --git a/build-tools/release.sh b/build/release.sh
similarity index 92%
rename from build-tools/release.sh
rename to build/release.sh
index 821c51c87b..e093121308 100755
--- a/build-tools/release.sh
+++ b/build/release.sh
@@ -26,8 +26,8 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/build-tools/common.sh"
-source "${KUBE_ROOT}/build-tools/lib/release.sh"
+source "${KUBE_ROOT}/build/common.sh"
+source "${KUBE_ROOT}/build/lib/release.sh"
 
 KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}
 
@@ -44,7 +44,7 @@ kube::build::copy_output
 
 if [[ "${FEDERATION:-}" == "true" ]];then
     (
-	source "${KUBE_ROOT}/build-tools/util.sh"
+	source "${KUBE_ROOT}/build/util.sh"
 	# Write federated docker image tag to workspace
 	kube::release::semantic_image_tag_version > "${KUBE_ROOT}/federation/manifests/federated-image.tag"
     )
diff --git a/build-tools/run.sh b/build/run.sh
similarity index 96%
rename from build-tools/run.sh
rename to build/run.sh
index 144e556908..af6e92dfa3 100755
--- a/build-tools/run.sh
+++ b/build/run.sh
@@ -23,7 +23,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "$KUBE_ROOT/build-tools/common.sh"
+source "$KUBE_ROOT/build/common.sh"
 
 kube::build::verify_prereqs
 kube::build::build_image
diff --git a/build-tools/shell.sh b/build/shell.sh
similarity index 90%
rename from build-tools/shell.sh
rename to build/shell.sh
index 37390ec358..6f546b662d 100755
--- a/build-tools/shell.sh
+++ b/build/shell.sh
@@ -23,8 +23,8 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/build-tools/common.sh"
-source "${KUBE_ROOT}/build-tools/lib/release.sh"
+source "${KUBE_ROOT}/build/common.sh"
+source "${KUBE_ROOT}/build/lib/release.sh"
 
 kube::build::verify_prereqs
 kube::build::build_image
diff --git a/build-tools/util.sh b/build/util.sh
similarity index 100%
rename from build-tools/util.sh
rename to build/util.sh
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index ca07bbbb0e..6a6d36c662 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -1549,7 +1549,7 @@ function kube-push {
 #   KUBE_ROOT
 function test-build-release {
   # Make a release
-  "${KUBE_ROOT}/build-tools/release.sh"
+  "${KUBE_ROOT}/build/release.sh"
 }
 
 # Execute prior to running tests to initialize required structure. This is
diff --git a/cluster/azure-legacy/util.sh b/cluster/azure-legacy/util.sh
index 0638918e43..b2c7c434e1 100644
--- a/cluster/azure-legacy/util.sh
+++ b/cluster/azure-legacy/util.sh
@@ -522,7 +522,7 @@ function kube-down {
 #   KUBE_ROOT
 function test-build-release {
     # Make a release
-    "${KUBE_ROOT}/build-tools/release.sh"
+    "${KUBE_ROOT}/build/release.sh"
 }
 
 # SSH to a node by name ($1) and run a command ($2).
diff --git a/cluster/common.sh b/cluster/common.sh
index 69e04fc612..5061b734cd 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -28,14 +28,14 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
 source "${KUBE_ROOT}/cluster/lib/logging.sh"
 # KUBE_RELEASE_VERSION_REGEX matches things like "v1.2.3" or "v1.2.3-alpha.4"
 #
-# NOTE This must match the version_regex in build-tools/common.sh
+# NOTE This must match the version_regex in build/common.sh
 # kube::release::parse_and_validate_release_version()
 KUBE_RELEASE_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alpha)\\.(0|[1-9][0-9]*))?$"
 KUBE_RELEASE_VERSION_DASHED_REGEX="v(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)(-(beta|alpha)-(0|[1-9][0-9]*))?"
 
 # KUBE_CI_VERSION_REGEX matches things like "v1.2.3-alpha.4.56+abcdefg" This
 #
-# NOTE This must match the version_regex in build-tools/common.sh
+# NOTE This must match the version_regex in build/common.sh
 # kube::release::parse_and_validate_ci_version()
 KUBE_CI_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-(beta|alpha)\\.(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*)\\+[-0-9a-z]*)?$"
 KUBE_CI_VERSION_DASHED_REGEX="^v(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(beta|alpha)-(0|[1-9][0-9]*)(-(0|[1-9][0-9]*)\\+[-0-9a-z]*)?"
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 14c9483523..83e4bf240a 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1792,7 +1792,7 @@ function kube-push() {
 #   KUBE_ROOT
 function test-build-release() {
   # Make a release
-  "${KUBE_ROOT}/build-tools/release.sh"
+  "${KUBE_ROOT}/build/release.sh"
 }
 
 # Execute prior to running tests to initialize required structure. This is
diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh
index 28d4d5e348..ecdd36bd1b 100755
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -85,7 +85,7 @@ function detect-project() {
 #   KUBE_ROOT
 function test-build-release() {
   echo "... in gke:test-build-release()" >&2
-  "${KUBE_ROOT}/build-tools/release.sh"
+  "${KUBE_ROOT}/build/release.sh"
 }
 
 # Verify needed binaries exist.
diff --git a/cluster/images/hyperkube/README.md b/cluster/images/hyperkube/README.md
index 000709a1a0..57943ca214 100644
--- a/cluster/images/hyperkube/README.md
+++ b/cluster/images/hyperkube/README.md
@@ -10,7 +10,7 @@ See https://github.com/kubernetes/kubernetes/blob/master/docs/devel/local-cluste
 
 ```console
 # First, build the binaries
-$ build-tools/run.sh make cross
+$ build/run.sh make cross
 
 # Build for linux/amd64 (default)
 $ make push VERSION={target_version} ARCH=amd64
diff --git a/cluster/images/kube-discovery/Makefile b/cluster/images/kube-discovery/Makefile
index 5183a86368..a85c7e0146 100644
--- a/cluster/images/kube-discovery/Makefile
+++ b/cluster/images/kube-discovery/Makefile
@@ -15,7 +15,7 @@
 # Build the kube-discovery image.
 #
 # Requires a pre-built kube-discovery binary:
-#   build-tools/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
+#   build/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
 #
 # Usage:
 #   [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] make (build|push) VERSION={some_released_version_of_kubernetes}
diff --git a/cluster/images/kube-discovery/README.md b/cluster/images/kube-discovery/README.md
index bf3a7d47f3..bc61db6fb7 100644
--- a/cluster/images/kube-discovery/README.md
+++ b/cluster/images/kube-discovery/README.md
@@ -23,7 +23,7 @@ $ cat token-map.json
 ## Build And Run From Source
 
 ```
-$ build-tools/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/amd64 make WHAT=cmd/kube-discovery"
+$ build/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/amd64 make WHAT=cmd/kube-discovery"
 $ _output/dockerized/bin/linux/amd64/kube-discovery
 2016/08/23 19:17:28 Listening for requests on port 9898.
 
diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
index 146884e7d9..7c37f28f83 100755
--- a/cluster/kubectl.sh
+++ b/cluster/kubectl.sh
@@ -97,7 +97,7 @@ if [[ -z "${KUBECTL_PATH:-}" ]]; then
       echo "It looks as if you don't have a compiled kubectl binary"
       echo
       echo "If you are running from a clone of the git repo, please run"
-      echo "'./build-tools/run.sh make cross'. Note that this requires having"
+      echo "'./build/run.sh make cross'. Note that this requires having"
       echo "Docker installed."
       echo
       echo "If you are running from a binary release tarball, something is wrong. "
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index 997201609f..5352f55c34 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -28,7 +28,7 @@ NODE_IPS=""
 #   KUBE_ROOT
 function test-build-release() {
   # Make a release
-  "${KUBE_ROOT}/build-tools/release.sh"
+  "${KUBE_ROOT}/build/release.sh"
 }
 
 # From user input set the necessary k8s and etcd configuration information
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index 267962c8f9..23255f79d6 100755
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -330,7 +330,7 @@ function kube-push {
 # Execute prior to running tests to build a release if required for env
 function test-build-release {
   # Make a release
-  "${KUBE_ROOT}/build-tools/release.sh"
+  "${KUBE_ROOT}/build/release.sh"
 }
 
 # Execute prior to running tests to initialize required structure
diff --git a/examples/cluster-dns/README.md b/examples/cluster-dns/README.md
index 0a35bcd4cb..798e0b97ac 100644
--- a/examples/cluster-dns/README.md
+++ b/examples/cluster-dns/README.md
@@ -4,7 +4,7 @@ This is a toy example demonstrating how to use kubernetes DNS.
 
 ### Step Zero: Prerequisites
 
-This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../build-tools/kube-dns/).
+This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../build/kube-dns/).
 
 ```sh
 $ cd kubernetes
diff --git a/examples/mysql-wordpress-pd/README.md b/examples/mysql-wordpress-pd/README.md
index 48b47a4e74..2881c0cec6 100644
--- a/examples/mysql-wordpress-pd/README.md
+++ b/examples/mysql-wordpress-pd/README.md
@@ -67,7 +67,7 @@ this example.
 * Kubernetes version 1.2 is required due to using newer features, such
   at PV Claims and Deployments. Run `kubectl version` to see your
   cluster version.
-* [Cluster DNS](../../build-tools/kube-dns/) will be used for service discovery.
+* [Cluster DNS](../../build/kube-dns/) will be used for service discovery.
 * An [external load balancer](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer)
   will be used to access WordPress.
 * [Persistent Volume Claims](http://kubernetes.io/docs/user-guide/persistent-volumes/)
diff --git a/examples/spark/README.md b/examples/spark/README.md
index b96d019c19..9699fbb39d 100644
--- a/examples/spark/README.md
+++ b/examples/spark/README.md
@@ -24,7 +24,7 @@ This example assumes
 
 - You have a Kubernetes cluster installed and running.
 - That you have installed the ```kubectl``` command line tool installed in your path and configured to talk to your Kubernetes cluster
-- That your Kubernetes cluster is running [kube-dns](../../build-tools/kube-dns/) or an equivalent integration.
+- That your Kubernetes cluster is running [kube-dns](../../build/kube-dns/) or an equivalent integration.
 
 Optionally, your Kubernetes cluster should be configured with a Loadbalancer integration (automatically configured via kube-up or GKE)
 
diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index b22ba84eb9..d8319de4a0 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -293,7 +293,7 @@ function push-federation-images {
     : "${FEDERATION_PUSH_REPO_BASE?Must set FEDERATION_PUSH_REPO_BASE env var}"
     : "${FEDERATION_IMAGE_TAG?Must set FEDERATION_IMAGE_TAG env var}"
 
-    source "${KUBE_ROOT}/build-tools/common.sh"
+    source "${KUBE_ROOT}/build/common.sh"
     source "${KUBE_ROOT}/hack/lib/util.sh"
 
     local FEDERATION_BINARIES=${FEDERATION_BINARIES:-"hyperkube"}
diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh
index 748ce4fc0b..ded9002696 100755
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -24,7 +24,7 @@ KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../)
 
 tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag"
 if [[ ! -f "$tagfile" ]]; then
-    echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build-tools/push-federation-images.sh"
+    echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build/push-federation-images.sh"
     exit 1
 fi
 export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")"
diff --git a/federation/develop/develop.sh b/federation/develop/develop.sh
index 7914c632a5..59f7621119 100755
--- a/federation/develop/develop.sh
+++ b/federation/develop/develop.sh
@@ -32,8 +32,8 @@ KUBE_ROOT="$(dirname "${BASH_SOURCE}")/../.."
 DEPLOY_ROOT="${KUBE_ROOT}/federation/deploy"
 CUR_ROOT="$(pwd)"
 
-source "${KUBE_ROOT}/build-tools/common.sh"
-source "${KUBE_ROOT}/build-tools/util.sh"
+source "${KUBE_ROOT}/build/common.sh"
+source "${KUBE_ROOT}/build/util.sh"
 # Provides the detect-project function
 source "${KUBE_ROOT}/cluster/kube-util.sh"
 # Provides logging facilities
diff --git a/hack/dev-build-and-push.sh b/hack/dev-build-and-push.sh
index 59a2b453ab..e971d09083 100755
--- a/hack/dev-build-and-push.sh
+++ b/hack/dev-build-and-push.sh
@@ -23,7 +23,7 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 # Build a release
-"${KUBE_ROOT}/build-tools/release.sh"
+"${KUBE_ROOT}/build/release.sh"
 if [ "$?" != "0" ]; then
         echo "Building a release failed!"
         exit 1
diff --git a/hack/dev-build-and-up.sh b/hack/dev-build-and-up.sh
index 1c6e320b51..f763c994cd 100755
--- a/hack/dev-build-and-up.sh
+++ b/hack/dev-build-and-up.sh
@@ -24,7 +24,7 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 # Then build a release
-"${KUBE_ROOT}/build-tools/release.sh"
+"${KUBE_ROOT}/build/release.sh"
 if [ "$?" != "0" ]; then
         echo "Building the release failed!"
         exit 1
diff --git a/hack/dev-push-hyperkube.sh b/hack/dev-push-hyperkube.sh
index b5bde0d56b..48fc69ec30 100755
--- a/hack/dev-push-hyperkube.sh
+++ b/hack/dev-push-hyperkube.sh
@@ -27,7 +27,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
-source "${KUBE_ROOT}/build-tools/common.sh"
+source "${KUBE_ROOT}/build/common.sh"
 
 if [[ -z "${REGISTRY:-}" ]]; then
 	echo "REGISTRY must be set"
diff --git a/hack/e2e-internal/e2e-up.sh b/hack/e2e-internal/e2e-up.sh
index 55b476ce04..fb80a23b4d 100755
--- a/hack/e2e-internal/e2e-up.sh
+++ b/hack/e2e-internal/e2e-up.sh
@@ -45,7 +45,7 @@ if [[ "${FEDERATION:-}" == "true" ]]; then
     done
     tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag"
     if [[ ! -f "$tagfile" ]]; then
-        echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build-tools/push-federation-images.sh"
+        echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build/push-federation-images.sh"
         exit 1
     fi
     export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")"
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 94fe434bb5..4e8f109c80 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -20,7 +20,7 @@ readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
 
 # The set of server targets that we are only building for Linux
 # Note: if you are adding something here, you might need to add it to
-# kube::build::source_targets in build-tools/common.sh as well.
+# kube::build::source_targets in build/common.sh as well.
 kube::golang::server_targets() {
   local targets=(
     cmd/kube-dns
@@ -69,7 +69,7 @@ else
   readonly KUBE_SERVER_PLATFORMS
 
   # If we update this we should also update the set of golang compilers we build
-  # in 'build-tools/build-image/cross/Dockerfile'. However, it's only a bit faster since go 1.5, not mandatory
+  # in 'build/build-image/cross/Dockerfile'. However, it's only a bit faster since go 1.5, not mandatory
   KUBE_CLIENT_PLATFORMS=(
     linux/amd64
     linux/386
diff --git a/hack/update-generated-protobuf.sh b/hack/update-generated-protobuf.sh
index be9863e611..f2cf01c0f0 100755
--- a/hack/update-generated-protobuf.sh
+++ b/hack/update-generated-protobuf.sh
@@ -21,9 +21,9 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 # NOTE: All output from this script needs to be copied back to the calling
-# source tree.  This is managed in kube::build::copy_output in build-tools/common.sh.
+# source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-"${KUBE_ROOT}/build-tools/run.sh" hack/update-generated-protobuf-dockerized.sh "$@"
+"${KUBE_ROOT}/build/run.sh" hack/update-generated-protobuf-dockerized.sh "$@"
 
 # ex: ts=2 sw=2 et filetype=sh
diff --git a/hack/update-generated-runtime.sh b/hack/update-generated-runtime.sh
index e45bf8b1ee..c347c01a69 100755
--- a/hack/update-generated-runtime.sh
+++ b/hack/update-generated-runtime.sh
@@ -21,9 +21,9 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 # NOTE: All output from this script needs to be copied back to the calling
-# source tree.  This is managed in kube::build::copy_output in build-tools/common.sh.
+# source tree.  This is managed in kube::build::copy_output in build/common.sh.
 # If the output set is changed update that function.
 
-${KUBE_ROOT}/build-tools/run.sh hack/update-generated-runtime-dockerized.sh "$@"
+${KUBE_ROOT}/build/run.sh hack/update-generated-runtime-dockerized.sh "$@"
 
 # ex: ts=2 sw=2 et filetype=sh
diff --git a/pkg/version/base.go b/pkg/version/base.go
index 5909815202..c377705fe8 100644
--- a/pkg/version/base.go
+++ b/pkg/version/base.go
@@ -29,7 +29,7 @@ package version
 // works for GitHub tar downloads.
 //
 // When releasing a new Kubernetes version, this file is updated by
-// build-tools/mark_new_version.sh to reflect the new version, and then a
+// build/mark_new_version.sh to reflect the new version, and then a
 // git annotated tag (using format vX.Y where X == Major version and Y
 // == Minor version) is created to point to the commit that updates
 // pkg/version/base.go
diff --git a/staging/src/k8s.io/client-go/pkg/version/base.go b/staging/src/k8s.io/client-go/pkg/version/base.go
index 5909815202..c377705fe8 100644
--- a/staging/src/k8s.io/client-go/pkg/version/base.go
+++ b/staging/src/k8s.io/client-go/pkg/version/base.go
@@ -29,7 +29,7 @@ package version
 // works for GitHub tar downloads.
 //
 // When releasing a new Kubernetes version, this file is updated by
-// build-tools/mark_new_version.sh to reflect the new version, and then a
+// build/mark_new_version.sh to reflect the new version, and then a
 // git annotated tag (using format vX.Y where X == Major version and Y
 // == Minor version) is created to point to the commit that updates
 // pkg/version/base.go