diff --git a/.bazelrc b/.bazelrc
index a8d655c..27915cc 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,6 +2,5 @@
 build --host_force_python=PY2
 test --host_force_python=PY2
 run --host_force_python=PY2
-# Required for app/gerrit/gerrit-oauth-provider
 build --workspace_status_command=./bzl/workspace-status.sh
 test --build_tests_only
diff --git a/WORKSPACE b/WORKSPACE
index 6450987..5bf90e8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -143,7 +143,7 @@
 
 gazelle_dependencies()
 
-# For app/gerrit/gerrit-oauth-provider
+# For devtools/gerrit/gerrit-oauth-provider
 
 git_repository(
     name = "com_googlesource_gerrit_bazlets",
diff --git a/devtools/README b/devtools/README
new file mode 100644
index 0000000..3646363
--- /dev/null
+++ b/devtools/README
@@ -0,0 +1,4 @@
+hscloud/devtools
+================
+
+Tools related to the review, build and test infrastructure.
diff --git a/app/bazel-cache/prod.jsonnet b/devtools/bazel-cache/prod.jsonnet
similarity index 100%
rename from app/bazel-cache/prod.jsonnet
rename to devtools/bazel-cache/prod.jsonnet
diff --git a/app/gerrit/BUILD b/devtools/gerrit/BUILD
similarity index 76%
rename from app/gerrit/BUILD
rename to devtools/gerrit/BUILD
index aaff8a0..d9170c0 100644
--- a/app/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -4,7 +4,7 @@
     name="with_plugins",
     base="@gerrit-3.0.0//image",
     files = [
-        "//app/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
+        "//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
     ],
     # we cannot drop it directly in /var/gerrit/plugins as that changes the
     # directory owner to 0:0 and then breaks the gerrit installer that wants
@@ -26,8 +26,8 @@
     executable = True,
     cmd = """
         tag=3.0.0-r7
-        docker tag bazel/app/gerrit:$$tag registry.k0.hswaw.net/app/gerrit:$$tag
-        docker push registry.k0.hswaw.net/app/gerrit:$$tag
+        docker tag bazel/devtools/gerrit:$$tag registry.k0.hswaw.net/devtools/gerrit:$$tag
+        docker push registry.k0.hswaw.net/devtools/gerrit:$$tag
         echo -ne "#!/bin/sh\necho Pushed $$tag.\n" > $(OUTS)
     """,
 )
diff --git a/app/gerrit/entrypoint.sh b/devtools/gerrit/entrypoint.sh
similarity index 100%
rename from app/gerrit/entrypoint.sh
rename to devtools/gerrit/entrypoint.sh
diff --git a/app/gerrit/gerrit-oauth-provider/.gitignore b/devtools/gerrit/gerrit-oauth-provider/.gitignore
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/.gitignore
rename to devtools/gerrit/gerrit-oauth-provider/.gitignore
diff --git a/app/gerrit/gerrit-oauth-provider/BUILD b/devtools/gerrit/gerrit-oauth-provider/BUILD
similarity index 88%
rename from app/gerrit/gerrit-oauth-provider/BUILD
rename to devtools/gerrit/gerrit-oauth-provider/BUILD
index bb266e4..c0b0b56 100644
--- a/app/gerrit/gerrit-oauth-provider/BUILD
+++ b/devtools/gerrit/gerrit-oauth-provider/BUILD
@@ -1,6 +1,6 @@
-load("//app/gerrit/gerrit-oauth-provider/tools/bzl:junit.bzl", "junit_tests")
+load("//devtools/gerrit/gerrit-oauth-provider/tools/bzl:junit.bzl", "junit_tests")
 load(
-    "//app/gerrit/gerrit-oauth-provider/tools/bzl:plugin.bzl",
+    "//devtools/gerrit/gerrit-oauth-provider/tools/bzl:plugin.bzl",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
     "gerrit_plugin",
diff --git a/app/gerrit/gerrit-oauth-provider/LICENSE-Apache2.0 b/devtools/gerrit/gerrit-oauth-provider/LICENSE-Apache2.0
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/LICENSE-Apache2.0
rename to devtools/gerrit/gerrit-oauth-provider/LICENSE-Apache2.0
diff --git a/app/gerrit/gerrit-oauth-provider/LICENSE-scribe b/devtools/gerrit/gerrit-oauth-provider/LICENSE-scribe
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/LICENSE-scribe
rename to devtools/gerrit/gerrit-oauth-provider/LICENSE-scribe
diff --git a/app/gerrit/gerrit-oauth-provider/README.md b/devtools/gerrit/gerrit-oauth-provider/README.md
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/README.md
rename to devtools/gerrit/gerrit-oauth-provider/README.md
diff --git a/app/gerrit/gerrit-oauth-provider/bazlets.bzl b/devtools/gerrit/gerrit-oauth-provider/bazlets.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/bazlets.bzl
rename to devtools/gerrit/gerrit-oauth-provider/bazlets.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/external_plugin_deps.bzl b/devtools/gerrit/gerrit-oauth-provider/external_plugin_deps.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/external_plugin_deps.bzl
rename to devtools/gerrit/gerrit-oauth-provider/external_plugin_deps.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/AirVantageOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/CasOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DexOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DisabledOAuthLoginProvider.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DisabledOAuthLoginProvider.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DisabledOAuthLoginProvider.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/DisabledOAuthLoginProvider.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Facebook2Api.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Facebook2Api.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Facebook2Api.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Facebook2Api.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/FacebookOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/FacebookOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/FacebookOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/FacebookOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHub2Api.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHub2Api.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHub2Api.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHub2Api.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHubOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHubOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHubOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitHubOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Google2Api.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Google2Api.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Google2Api.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Google2Api.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/KeycloakOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth20ServiceImpl.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth20ServiceImpl.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth20ServiceImpl.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth20ServiceImpl.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractor.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractor.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractor.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractor.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365Api.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365Api.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365Api.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365Api.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceApi.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceApi.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceApi.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceApi.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceOAuthService.java b/devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceOAuthService.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceOAuthService.java
rename to devtools/gerrit/gerrit-oauth-provider/src/main/java/com/googlesource/gerrit/plugins/oauth/WarsawHackerspaceOAuthService.java
diff --git a/app/gerrit/gerrit-oauth-provider/src/test/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractorTest.java b/devtools/gerrit/gerrit-oauth-provider/src/test/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractorTest.java
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/src/test/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractorTest.java
rename to devtools/gerrit/gerrit-oauth-provider/src/test/java/com/googlesource/gerrit/plugins/oauth/OAuth2AccessTokenJsonExtractorTest.java
diff --git a/app/gerrit/gerrit-oauth-provider/tools/bzl/BUILD b/devtools/gerrit/gerrit-oauth-provider/tools/bzl/BUILD
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/bzl/BUILD
rename to devtools/gerrit/gerrit-oauth-provider/tools/bzl/BUILD
diff --git a/app/gerrit/gerrit-oauth-provider/tools/bzl/classpath.bzl b/devtools/gerrit/gerrit-oauth-provider/tools/bzl/classpath.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/bzl/classpath.bzl
rename to devtools/gerrit/gerrit-oauth-provider/tools/bzl/classpath.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/tools/bzl/junit.bzl b/devtools/gerrit/gerrit-oauth-provider/tools/bzl/junit.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/bzl/junit.bzl
rename to devtools/gerrit/gerrit-oauth-provider/tools/bzl/junit.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/tools/bzl/maven_jar.bzl b/devtools/gerrit/gerrit-oauth-provider/tools/bzl/maven_jar.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/bzl/maven_jar.bzl
rename to devtools/gerrit/gerrit-oauth-provider/tools/bzl/maven_jar.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/tools/bzl/plugin.bzl b/devtools/gerrit/gerrit-oauth-provider/tools/bzl/plugin.bzl
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/bzl/plugin.bzl
rename to devtools/gerrit/gerrit-oauth-provider/tools/bzl/plugin.bzl
diff --git a/app/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD b/devtools/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD
similarity index 61%
rename from app/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD
rename to devtools/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD
index 0dced85..e9cb228 100644
--- a/app/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD
+++ b/devtools/gerrit/gerrit-oauth-provider/tools/eclipse/BUILD
@@ -1,4 +1,4 @@
-load("//app/gerrit/gerrit-oauth-provider/tools/bzl:classpath.bzl", "classpath_collector")
+load("//devtools/gerrit/gerrit-oauth-provider/tools/bzl:classpath.bzl", "classpath_collector")
 
 classpath_collector(
     name = "main_classpath_collect",
diff --git a/app/gerrit/gerrit-oauth-provider/tools/eclipse/project.sh b/devtools/gerrit/gerrit-oauth-provider/tools/eclipse/project.sh
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/eclipse/project.sh
rename to devtools/gerrit/gerrit-oauth-provider/tools/eclipse/project.sh
diff --git a/app/gerrit/gerrit-oauth-provider/tools/workspace-status.sh b/devtools/gerrit/gerrit-oauth-provider/tools/workspace-status.sh
similarity index 100%
rename from app/gerrit/gerrit-oauth-provider/tools/workspace-status.sh
rename to devtools/gerrit/gerrit-oauth-provider/tools/workspace-status.sh
diff --git a/app/gerrit/kube/gerrit.libsonnet b/devtools/gerrit/kube/gerrit.libsonnet
similarity index 98%
rename from app/gerrit/kube/gerrit.libsonnet
rename to devtools/gerrit/kube/gerrit.libsonnet
index d78f8f4..e36c7fa 100644
--- a/app/gerrit/kube/gerrit.libsonnet
+++ b/devtools/gerrit/kube/gerrit.libsonnet
@@ -39,7 +39,7 @@
         },
 
         tag: "3.0.0-r7",
-        image: "registry.k0.hswaw.net/app/gerrit:" + cfg.tag,
+        image: "registry.k0.hswaw.net/devtools/gerrit:" + cfg.tag,
         resources: {
             requests: {
                 cpu: "100m",
diff --git a/app/gerrit/kube/prod.jsonnet b/devtools/gerrit/kube/prod.jsonnet
similarity index 100%
rename from app/gerrit/kube/prod.jsonnet
rename to devtools/gerrit/kube/prod.jsonnet