Update to the new structure
diff --git a/build_tools/docker/bazel_nvidia/Dockerfile b/build_tools/docker/bazel_nvidia/Dockerfile
index 22dd573..86305c4 100644
--- a/build_tools/docker/bazel_nvidia/Dockerfile
+++ b/build_tools/docker/bazel_nvidia/Dockerfile
@@ -32,13 +32,15 @@
 
 ARG VULKAN_SDK_VERSION=1.2.141
 
-# Disable apt-key parse waring.
-ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
+# Disable apt-key parse waring. If someone knows how to do whatever the "proper"
+# thing is then feel free. The warning complains about parsing apt-key output,
+# which we're not even doing.
+ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
 
-# Disable prompt during keyboard configuration.
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - \
-  && wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-bionic.list http://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-bionic.list \
+RUN wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc \
+    | apt-key add - \
+  && wget -qO \
+    "/etc/apt/sources.list.d/lunarg-vulkan-${VULKAN_SDK_VERSION?}-bionic.list" \
+    "http://packages.lunarg.com/vulkan/${VULKAN_SDK_VERSION?}/lunarg-vulkan-${VULKAN_SDK_VERSION?}-bionic.list" \
   && apt-get update \
-  && apt-get install -y vulkan-sdk nvidia-driver-440
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y vulkan-sdk nvidia-driver-440
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86/turing/build_kokoro.sh
old mode 100644
new mode 100755
similarity index 94%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/build_kokoro.sh
rename to build_tools/kokoro/gcp_ubuntu/bazel/linux/x86/turing/build_kokoro.sh
index 93b7601..90b90b0
--- a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/build_kokoro.sh
+++ b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86/turing/build_kokoro.sh
@@ -35,7 +35,7 @@
   --env IREE_VULKAN_DISABLE=0 \
   --gpus all \
   gcr.io/iree-oss/bazel-nvidia:prod \
-  kokoro/gcp_ubuntu/bazel/integrations/build.sh
+  build_tools/kokoro/gcp_ubuntu/bazel/linux/x86/integrations/build.sh
 
 # Kokoro will rsync this entire directory back to the executor orchestrating the
 # build which takes forever and is totally useless.
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/common.cfg b/kokoro/gcp_ubuntu/bazel/turing/common.cfg
similarity index 76%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/common.cfg
rename to kokoro/gcp_ubuntu/bazel/turing/common.cfg
index 277ffa0..2f36e72 100644
--- a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/common.cfg
+++ b/kokoro/gcp_ubuntu/bazel/turing/common.cfg
@@ -14,7 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Common configuration for Kokoro builds that run the integrations build with
-# bazel on linux with NVIDIA GPUs.
-
-build_file: "iree/kokoro/gcp_ubuntu/bazel/linux/x86-turing/build_kokoro.sh"
+build_file: "iree/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86/turing/build_kokoro.sh"
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/continuous.cfg b/kokoro/gcp_ubuntu/bazel/turing/continuous.cfg
similarity index 100%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/continuous.cfg
rename to kokoro/gcp_ubuntu/bazel/turing/continuous.cfg
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/google.cfg b/kokoro/gcp_ubuntu/bazel/turing/google.cfg
similarity index 100%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/google.cfg
rename to kokoro/gcp_ubuntu/bazel/turing/google.cfg
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/main.cfg b/kokoro/gcp_ubuntu/bazel/turing/main.cfg
similarity index 100%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/main.cfg
rename to kokoro/gcp_ubuntu/bazel/turing/main.cfg
diff --git a/kokoro/gcp_ubuntu/bazel/linux/x86-turing/presubmit.cfg b/kokoro/gcp_ubuntu/bazel/turing/presubmit.cfg
similarity index 100%
rename from kokoro/gcp_ubuntu/bazel/linux/x86-turing/presubmit.cfg
rename to kokoro/gcp_ubuntu/bazel/turing/presubmit.cfg