diff --git a/hack/config-go.sh b/hack/config-go.sh
index eeeecdc805e..d35fe654929 100755
--- a/hack/config-go.sh
+++ b/hack/config-go.sh
@@ -53,7 +53,7 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}"
     fi
 
     rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true
-    ln -s "${THIRD_PARTY_BASE}/${p}" "${PACKAGE_DIR}"
+    ln -s "${THIRD_PARTY_BASE}/src/${p}" "${PACKAGE_DIR}"
   done
 
   for p in ${PACKAGES}; do
diff --git a/hooks/prepare-commit-msg b/hooks/prepare-commit-msg
index 63e55a72dab..b6f43d3135a 100755
--- a/hooks/prepare-commit-msg
+++ b/hooks/prepare-commit-msg
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 errors=0
-for file in $(git diff --cached --name-only | grep "\.go"); do
+for file in $(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v "third_party"); do
   diff="$(git show ":${file}" | gofmt -s -d)"
   if [[ -n "$diff" ]]; then
     echo "# *** ERROR: *** File ${file} has not been gofmt'd." >> $1
diff --git a/release/release.sh b/release/release.sh
index c1272d681cb..62ecf112ba2 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -40,7 +40,7 @@ mkdir -p $MASTER_RELEASE_DIR/third_party/go
 echo "Building release tree"
 cp release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
 cp -r cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase
-cp -r third_party $MASTER_RELEASE_DIR/third_party/go/src
+cp -r third_party/src $MASTER_RELEASE_DIR/third_party/go/src
 
 function find_go_files() {
   find * -not \( \
diff --git a/third_party/bitbucket.org/kardianos/osext/LICENSE b/third_party/src/bitbucket.org/kardianos/osext/LICENSE
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/LICENSE
rename to third_party/src/bitbucket.org/kardianos/osext/LICENSE
diff --git a/third_party/bitbucket.org/kardianos/osext/osext.go b/third_party/src/bitbucket.org/kardianos/osext/osext.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext.go
diff --git a/third_party/bitbucket.org/kardianos/osext/osext_plan9.go b/third_party/src/bitbucket.org/kardianos/osext/osext_plan9.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext_plan9.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext_plan9.go
diff --git a/third_party/bitbucket.org/kardianos/osext/osext_procfs.go b/third_party/src/bitbucket.org/kardianos/osext/osext_procfs.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext_procfs.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext_procfs.go
diff --git a/third_party/bitbucket.org/kardianos/osext/osext_sysctl.go b/third_party/src/bitbucket.org/kardianos/osext/osext_sysctl.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext_sysctl.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext_sysctl.go
diff --git a/third_party/bitbucket.org/kardianos/osext/osext_test.go b/third_party/src/bitbucket.org/kardianos/osext/osext_test.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext_test.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext_test.go
diff --git a/third_party/bitbucket.org/kardianos/osext/osext_windows.go b/third_party/src/bitbucket.org/kardianos/osext/osext_windows.go
similarity index 100%
rename from third_party/bitbucket.org/kardianos/osext/osext_windows.go
rename to third_party/src/bitbucket.org/kardianos/osext/osext_windows.go
diff --git a/third_party/github.com/coreos/go-etcd/LICENSE b/third_party/src/github.com/coreos/go-etcd/LICENSE
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/LICENSE
rename to third_party/src/github.com/coreos/go-etcd/LICENSE
diff --git a/third_party/github.com/coreos/go-etcd/README.md b/third_party/src/github.com/coreos/go-etcd/README.md
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/README.md
rename to third_party/src/github.com/coreos/go-etcd/README.md
diff --git a/third_party/github.com/coreos/go-etcd/etcd/add_child.go b/third_party/src/github.com/coreos/go-etcd/etcd/add_child.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/add_child.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/add_child.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/add_child_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/add_child_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/add_child_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/add_child_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/client.go b/third_party/src/github.com/coreos/go-etcd/etcd/client.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/client.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/client.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/client_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/client_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/client_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/client_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/cluster.go b/third_party/src/github.com/coreos/go-etcd/etcd/cluster.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/cluster.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/cluster.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/compare_and_delete.go b/third_party/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/compare_and_delete.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/compare_and_swap.go b/third_party/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/compare_and_swap.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/debug.go b/third_party/src/github.com/coreos/go-etcd/etcd/debug.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/debug.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/debug.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/delete.go b/third_party/src/github.com/coreos/go-etcd/etcd/delete.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/delete.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/delete.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/delete_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/delete_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/delete_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/delete_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/error.go b/third_party/src/github.com/coreos/go-etcd/etcd/error.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/error.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/error.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/get.go b/third_party/src/github.com/coreos/go-etcd/etcd/get.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/get.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/get.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/get_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/get_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/get_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/get_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/options.go b/third_party/src/github.com/coreos/go-etcd/etcd/options.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/options.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/options.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/requests.go b/third_party/src/github.com/coreos/go-etcd/etcd/requests.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/requests.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/requests.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/response.go b/third_party/src/github.com/coreos/go-etcd/etcd/response.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/response.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/response.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/set_update_create.go b/third_party/src/github.com/coreos/go-etcd/etcd/set_update_create.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/set_update_create.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/set_update_create.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/set_update_create_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/set_update_create_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/version.go b/third_party/src/github.com/coreos/go-etcd/etcd/version.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/version.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/version.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/watch.go b/third_party/src/github.com/coreos/go-etcd/etcd/watch.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/watch.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/watch.go
diff --git a/third_party/github.com/coreos/go-etcd/etcd/watch_test.go b/third_party/src/github.com/coreos/go-etcd/etcd/watch_test.go
similarity index 100%
rename from third_party/github.com/coreos/go-etcd/etcd/watch_test.go
rename to third_party/src/github.com/coreos/go-etcd/etcd/watch_test.go
diff --git a/third_party/github.com/coreos/go-log/LICENSE b/third_party/src/github.com/coreos/go-log/LICENSE
similarity index 100%
rename from third_party/github.com/coreos/go-log/LICENSE
rename to third_party/src/github.com/coreos/go-log/LICENSE
diff --git a/third_party/github.com/coreos/go-log/README.md b/third_party/src/github.com/coreos/go-log/README.md
similarity index 100%
rename from third_party/github.com/coreos/go-log/README.md
rename to third_party/src/github.com/coreos/go-log/README.md
diff --git a/third_party/github.com/coreos/go-log/log/commands.go b/third_party/src/github.com/coreos/go-log/log/commands.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/commands.go
rename to third_party/src/github.com/coreos/go-log/log/commands.go
diff --git a/third_party/github.com/coreos/go-log/log/fields.go b/third_party/src/github.com/coreos/go-log/log/fields.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/fields.go
rename to third_party/src/github.com/coreos/go-log/log/fields.go
diff --git a/third_party/github.com/coreos/go-log/log/logger.go b/third_party/src/github.com/coreos/go-log/log/logger.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/logger.go
rename to third_party/src/github.com/coreos/go-log/log/logger.go
diff --git a/third_party/github.com/coreos/go-log/log/priority.go b/third_party/src/github.com/coreos/go-log/log/priority.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/priority.go
rename to third_party/src/github.com/coreos/go-log/log/priority.go
diff --git a/third_party/github.com/coreos/go-log/log/sinks.go b/third_party/src/github.com/coreos/go-log/log/sinks.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/sinks.go
rename to third_party/src/github.com/coreos/go-log/log/sinks.go
diff --git a/third_party/github.com/coreos/go-log/log/sinks_unix.go b/third_party/src/github.com/coreos/go-log/log/sinks_unix.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/sinks_unix.go
rename to third_party/src/github.com/coreos/go-log/log/sinks_unix.go
diff --git a/third_party/github.com/coreos/go-log/log/sinks_windows.go b/third_party/src/github.com/coreos/go-log/log/sinks_windows.go
similarity index 100%
rename from third_party/github.com/coreos/go-log/log/sinks_windows.go
rename to third_party/src/github.com/coreos/go-log/log/sinks_windows.go
diff --git a/third_party/github.com/coreos/go-systemd/journal/send.go b/third_party/src/github.com/coreos/go-systemd/journal/send.go
similarity index 100%
rename from third_party/github.com/coreos/go-systemd/journal/send.go
rename to third_party/src/github.com/coreos/go-systemd/journal/send.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/.travis.yml b/third_party/src/github.com/fsouza/go-dockerclient/.travis.yml
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/.travis.yml
rename to third_party/src/github.com/fsouza/go-dockerclient/.travis.yml
diff --git a/third_party/github.com/fsouza/go-dockerclient/AUTHORS b/third_party/src/github.com/fsouza/go-dockerclient/AUTHORS
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/AUTHORS
rename to third_party/src/github.com/fsouza/go-dockerclient/AUTHORS
diff --git a/third_party/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/third_party/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
rename to third_party/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
diff --git a/third_party/github.com/fsouza/go-dockerclient/LICENSE b/third_party/src/github.com/fsouza/go-dockerclient/LICENSE
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/LICENSE
rename to third_party/src/github.com/fsouza/go-dockerclient/LICENSE
diff --git a/third_party/github.com/fsouza/go-dockerclient/README.markdown b/third_party/src/github.com/fsouza/go-dockerclient/README.markdown
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/README.markdown
rename to third_party/src/github.com/fsouza/go-dockerclient/README.markdown
diff --git a/third_party/github.com/fsouza/go-dockerclient/change.go b/third_party/src/github.com/fsouza/go-dockerclient/change.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/change.go
rename to third_party/src/github.com/fsouza/go-dockerclient/change.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/change_test.go b/third_party/src/github.com/fsouza/go-dockerclient/change_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/change_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/change_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/client.go b/third_party/src/github.com/fsouza/go-dockerclient/client.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/client.go
rename to third_party/src/github.com/fsouza/go-dockerclient/client.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/client_test.go b/third_party/src/github.com/fsouza/go-dockerclient/client_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/client_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/client_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/container.go b/third_party/src/github.com/fsouza/go-dockerclient/container.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/container.go
rename to third_party/src/github.com/fsouza/go-dockerclient/container.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/container_test.go b/third_party/src/github.com/fsouza/go-dockerclient/container_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/container_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/container_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/engine.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/engine.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/engine.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/engine.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/engine_test.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/engine_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/engine_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/engine_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/env.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/env.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/env.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/env.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/env_test.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/env_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/env_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/env_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/hack.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/hack.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/hack.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/hack.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/helpers_test.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/helpers_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/helpers_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/helpers_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/http.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/http.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/http.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/http.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/job.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/job.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/job.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/job.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/job_test.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/job_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/job_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/job_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/streams.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/streams.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/streams.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/streams.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/engine/streams_test.go b/third_party/src/github.com/fsouza/go-dockerclient/engine/streams_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/engine/streams_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/engine/streams_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/event.go b/third_party/src/github.com/fsouza/go-dockerclient/event.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/event.go
rename to third_party/src/github.com/fsouza/go-dockerclient/event.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/event_test.go b/third_party/src/github.com/fsouza/go-dockerclient/event_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/event_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/event_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/example_test.go b/third_party/src/github.com/fsouza/go-dockerclient/example_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/example_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/example_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/image.go b/third_party/src/github.com/fsouza/go-dockerclient/image.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/image.go
rename to third_party/src/github.com/fsouza/go-dockerclient/image.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/image_test.go b/third_party/src/github.com/fsouza/go-dockerclient/image_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/image_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/image_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/misc.go b/third_party/src/github.com/fsouza/go-dockerclient/misc.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/misc.go
rename to third_party/src/github.com/fsouza/go-dockerclient/misc.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/misc_test.go b/third_party/src/github.com/fsouza/go-dockerclient/misc_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/misc_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/misc_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/signal.go b/third_party/src/github.com/fsouza/go-dockerclient/signal.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/signal.go
rename to third_party/src/github.com/fsouza/go-dockerclient/signal.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/third_party/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
rename to third_party/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
diff --git a/third_party/github.com/fsouza/go-dockerclient/testing/data/container.tar b/third_party/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/testing/data/container.tar
rename to third_party/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
diff --git a/third_party/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/third_party/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
rename to third_party/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
diff --git a/third_party/github.com/fsouza/go-dockerclient/testing/server.go b/third_party/src/github.com/fsouza/go-dockerclient/testing/server.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/testing/server.go
rename to third_party/src/github.com/fsouza/go-dockerclient/testing/server.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/testing/server_test.go b/third_party/src/github.com/fsouza/go-dockerclient/testing/server_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/testing/server_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/testing/server_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/random.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/random.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/random.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/random.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/stdcopy.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/stdcopy.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/stdcopy.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/stdcopy.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/uname_darwin.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/uname_darwin.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/uname_darwin.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/uname_darwin.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/uname_linux.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/uname_linux.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/uname_linux.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/uname_linux.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/utils.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/utils.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/utils.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/utils.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/utils_test.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/utils_test.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/utils_test.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/utils_test.go
diff --git a/third_party/github.com/fsouza/go-dockerclient/utils/utils_windows.go b/third_party/src/github.com/fsouza/go-dockerclient/utils/utils_windows.go
similarity index 100%
rename from third_party/github.com/fsouza/go-dockerclient/utils/utils_windows.go
rename to third_party/src/github.com/fsouza/go-dockerclient/utils/utils_windows.go
diff --git a/third_party/gonuts.org/v1/yaml/LICENSE b/third_party/src/gonuts.org/v1/yaml/LICENSE
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/LICENSE
rename to third_party/src/gonuts.org/v1/yaml/LICENSE
diff --git a/third_party/gonuts.org/v1/yaml/LICENSE.libyaml b/third_party/src/gonuts.org/v1/yaml/LICENSE.libyaml
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/LICENSE.libyaml
rename to third_party/src/gonuts.org/v1/yaml/LICENSE.libyaml
diff --git a/third_party/gonuts.org/v1/yaml/README.md b/third_party/src/gonuts.org/v1/yaml/README.md
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/README.md
rename to third_party/src/gonuts.org/v1/yaml/README.md
diff --git a/third_party/gonuts.org/v1/yaml/apic.go b/third_party/src/gonuts.org/v1/yaml/apic.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/apic.go
rename to third_party/src/gonuts.org/v1/yaml/apic.go
diff --git a/third_party/gonuts.org/v1/yaml/decode.go b/third_party/src/gonuts.org/v1/yaml/decode.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/decode.go
rename to third_party/src/gonuts.org/v1/yaml/decode.go
diff --git a/third_party/gonuts.org/v1/yaml/decode_test.go b/third_party/src/gonuts.org/v1/yaml/decode_test.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/decode_test.go
rename to third_party/src/gonuts.org/v1/yaml/decode_test.go
diff --git a/third_party/gonuts.org/v1/yaml/emitterc.go b/third_party/src/gonuts.org/v1/yaml/emitterc.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/emitterc.go
rename to third_party/src/gonuts.org/v1/yaml/emitterc.go
diff --git a/third_party/gonuts.org/v1/yaml/encode.go b/third_party/src/gonuts.org/v1/yaml/encode.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/encode.go
rename to third_party/src/gonuts.org/v1/yaml/encode.go
diff --git a/third_party/gonuts.org/v1/yaml/encode_test.go b/third_party/src/gonuts.org/v1/yaml/encode_test.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/encode_test.go
rename to third_party/src/gonuts.org/v1/yaml/encode_test.go
diff --git a/third_party/gonuts.org/v1/yaml/parserc.go b/third_party/src/gonuts.org/v1/yaml/parserc.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/parserc.go
rename to third_party/src/gonuts.org/v1/yaml/parserc.go
diff --git a/third_party/gonuts.org/v1/yaml/readerc.go b/third_party/src/gonuts.org/v1/yaml/readerc.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/readerc.go
rename to third_party/src/gonuts.org/v1/yaml/readerc.go
diff --git a/third_party/gonuts.org/v1/yaml/resolve.go b/third_party/src/gonuts.org/v1/yaml/resolve.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/resolve.go
rename to third_party/src/gonuts.org/v1/yaml/resolve.go
diff --git a/third_party/gonuts.org/v1/yaml/scannerc.go b/third_party/src/gonuts.org/v1/yaml/scannerc.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/scannerc.go
rename to third_party/src/gonuts.org/v1/yaml/scannerc.go
diff --git a/third_party/gonuts.org/v1/yaml/sorter.go b/third_party/src/gonuts.org/v1/yaml/sorter.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/sorter.go
rename to third_party/src/gonuts.org/v1/yaml/sorter.go
diff --git a/third_party/gonuts.org/v1/yaml/suite_test.go b/third_party/src/gonuts.org/v1/yaml/suite_test.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/suite_test.go
rename to third_party/src/gonuts.org/v1/yaml/suite_test.go
diff --git a/third_party/gonuts.org/v1/yaml/writerc.go b/third_party/src/gonuts.org/v1/yaml/writerc.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/writerc.go
rename to third_party/src/gonuts.org/v1/yaml/writerc.go
diff --git a/third_party/gonuts.org/v1/yaml/yaml.go b/third_party/src/gonuts.org/v1/yaml/yaml.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/yaml.go
rename to third_party/src/gonuts.org/v1/yaml/yaml.go
diff --git a/third_party/gonuts.org/v1/yaml/yamlh.go b/third_party/src/gonuts.org/v1/yaml/yamlh.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/yamlh.go
rename to third_party/src/gonuts.org/v1/yaml/yamlh.go
diff --git a/third_party/gonuts.org/v1/yaml/yamlprivateh.go b/third_party/src/gonuts.org/v1/yaml/yamlprivateh.go
similarity index 100%
rename from third_party/gonuts.org/v1/yaml/yamlprivateh.go
rename to third_party/src/gonuts.org/v1/yaml/yamlprivateh.go
diff --git a/third_party/gopkg.in/v1/yaml/LICENSE b/third_party/src/gopkg.in/v1/yaml/LICENSE
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/LICENSE
rename to third_party/src/gopkg.in/v1/yaml/LICENSE
diff --git a/third_party/gopkg.in/v1/yaml/LICENSE.libyaml b/third_party/src/gopkg.in/v1/yaml/LICENSE.libyaml
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/LICENSE.libyaml
rename to third_party/src/gopkg.in/v1/yaml/LICENSE.libyaml
diff --git a/third_party/gopkg.in/v1/yaml/README.md b/third_party/src/gopkg.in/v1/yaml/README.md
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/README.md
rename to third_party/src/gopkg.in/v1/yaml/README.md
diff --git a/third_party/gopkg.in/v1/yaml/apic.go b/third_party/src/gopkg.in/v1/yaml/apic.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/apic.go
rename to third_party/src/gopkg.in/v1/yaml/apic.go
diff --git a/third_party/gopkg.in/v1/yaml/decode.go b/third_party/src/gopkg.in/v1/yaml/decode.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/decode.go
rename to third_party/src/gopkg.in/v1/yaml/decode.go
diff --git a/third_party/gopkg.in/v1/yaml/decode_test.go b/third_party/src/gopkg.in/v1/yaml/decode_test.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/decode_test.go
rename to third_party/src/gopkg.in/v1/yaml/decode_test.go
diff --git a/third_party/gopkg.in/v1/yaml/emitterc.go b/third_party/src/gopkg.in/v1/yaml/emitterc.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/emitterc.go
rename to third_party/src/gopkg.in/v1/yaml/emitterc.go
diff --git a/third_party/gopkg.in/v1/yaml/encode.go b/third_party/src/gopkg.in/v1/yaml/encode.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/encode.go
rename to third_party/src/gopkg.in/v1/yaml/encode.go
diff --git a/third_party/gopkg.in/v1/yaml/encode_test.go b/third_party/src/gopkg.in/v1/yaml/encode_test.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/encode_test.go
rename to third_party/src/gopkg.in/v1/yaml/encode_test.go
diff --git a/third_party/gopkg.in/v1/yaml/parserc.go b/third_party/src/gopkg.in/v1/yaml/parserc.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/parserc.go
rename to third_party/src/gopkg.in/v1/yaml/parserc.go
diff --git a/third_party/gopkg.in/v1/yaml/readerc.go b/third_party/src/gopkg.in/v1/yaml/readerc.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/readerc.go
rename to third_party/src/gopkg.in/v1/yaml/readerc.go
diff --git a/third_party/gopkg.in/v1/yaml/resolve.go b/third_party/src/gopkg.in/v1/yaml/resolve.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/resolve.go
rename to third_party/src/gopkg.in/v1/yaml/resolve.go
diff --git a/third_party/gopkg.in/v1/yaml/scannerc.go b/third_party/src/gopkg.in/v1/yaml/scannerc.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/scannerc.go
rename to third_party/src/gopkg.in/v1/yaml/scannerc.go
diff --git a/third_party/gopkg.in/v1/yaml/sorter.go b/third_party/src/gopkg.in/v1/yaml/sorter.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/sorter.go
rename to third_party/src/gopkg.in/v1/yaml/sorter.go
diff --git a/third_party/gopkg.in/v1/yaml/suite_test.go b/third_party/src/gopkg.in/v1/yaml/suite_test.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/suite_test.go
rename to third_party/src/gopkg.in/v1/yaml/suite_test.go
diff --git a/third_party/gopkg.in/v1/yaml/writerc.go b/third_party/src/gopkg.in/v1/yaml/writerc.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/writerc.go
rename to third_party/src/gopkg.in/v1/yaml/writerc.go
diff --git a/third_party/gopkg.in/v1/yaml/yaml.go b/third_party/src/gopkg.in/v1/yaml/yaml.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/yaml.go
rename to third_party/src/gopkg.in/v1/yaml/yaml.go
diff --git a/third_party/gopkg.in/v1/yaml/yamlh.go b/third_party/src/gopkg.in/v1/yaml/yamlh.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/yamlh.go
rename to third_party/src/gopkg.in/v1/yaml/yamlh.go
diff --git a/third_party/gopkg.in/v1/yaml/yamlprivateh.go b/third_party/src/gopkg.in/v1/yaml/yamlprivateh.go
similarity index 100%
rename from third_party/gopkg.in/v1/yaml/yamlprivateh.go
rename to third_party/src/gopkg.in/v1/yaml/yamlprivateh.go
diff --git a/third_party/update.sh b/third_party/update.sh
index 2b1c521402d..302102293a8 100755
--- a/third_party/update.sh
+++ b/third_party/update.sh
@@ -14,8 +14,8 @@ cd $THIRD_PARTY_DIR
 . ./deps.sh
 
 # Create a temp GOPATH root.  It must be an absolute path
-mkdir -p ../target/go_dep_update
-cd ../target/go_dep_update
+mkdir -p ../output/go_dep_update
+cd ../output/go_dep_update
 TMP_GO_ROOT=$PWD
 cd -
 export GOPATH=${TMP_GO_ROOT}
@@ -50,10 +50,10 @@ for p in $PACKAGES; do
   cd -
 
   # Copy the code into the final directory
-  rsync -a -z -r --exclude '.git/' --exclude '.hg/' $TMP_GO_ROOT/src/$p/ $p
+  rsync -a -z -r --exclude '.git/' --exclude '.hg/' $TMP_GO_ROOT/src/$p/ src/$p
 
   # Make a nice commit about what everything bumped to
-  git add $p
+  git add src/$p
   if ! git diff --cached --exit-code > /dev/null 2>&1; then
     git commit -m "bump($p): $HEAD"
   fi