diff --git a/app/build.gradle b/app/build.gradle
index 085228ca72..ad3591c7aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,9 +11,9 @@ plugins {
     id 'kotlin-parcelize'
     id 'com.squareup.wire'
     id 'android-constants'
+    id 'translations'
 }
 
-apply from: 'translations.gradle'
 apply from: 'static-ips.gradle'
 
 protobuf {
diff --git a/build-logic/plugins/build.gradle b/build-logic/plugins/build.gradle
index 7b6a69d195..b929e0752c 100644
--- a/build-logic/plugins/build.gradle
+++ b/build-logic/plugins/build.gradle
@@ -5,4 +5,5 @@ plugins {
 dependencies {
     implementation libs.android.library
     implementation libs.android.application
+    implementation project(':tools')
 }
\ No newline at end of file
diff --git a/app/translations.gradle b/build-logic/plugins/src/main/java/translations.gradle
similarity index 99%
rename from app/translations.gradle
rename to build-logic/plugins/src/main/java/translations.gradle
index 08f7d2b13e..fe3eee1b67 100644
--- a/app/translations.gradle
+++ b/build-logic/plugins/src/main/java/translations.gradle
@@ -1,7 +1,7 @@
 import groovy.io.FileType
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.SimpleType
-import org.signal.StaticIpResolver
+import org.signal.buildtools.StaticIpResolver
 
 ext {
     autoResConfig = this.&autoResConfig
diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle
index 91916c8695..dc0507652e 100644
--- a/build-logic/settings.gradle
+++ b/build-logic/settings.gradle
@@ -18,5 +18,6 @@ dependencyResolutionManagement {
 rootProject.name = "build-logic"
 
 include ':plugins'
+include ':tools'
 
 apply from: '../dependencies.gradle'
diff --git a/build-logic/tools/build.gradle b/build-logic/tools/build.gradle
new file mode 100644
index 0000000000..3af03ef100
--- /dev/null
+++ b/build-logic/tools/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id "java-library"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation libs.dnsjava
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/org/signal/StaticIpResolver.java b/build-logic/tools/src/main/java/org/signal/buildtools/StaticIpResolver.java
similarity index 91%
rename from buildSrc/src/main/java/org/signal/StaticIpResolver.java
rename to build-logic/tools/src/main/java/org/signal/buildtools/StaticIpResolver.java
index d483a59336..a0a2905c72 100644
--- a/buildSrc/src/main/java/org/signal/StaticIpResolver.java
+++ b/build-logic/tools/src/main/java/org/signal/buildtools/StaticIpResolver.java
@@ -1,6 +1,5 @@
-package org.signal;
+package org.signal.buildtools;
 
-import org.gradle.internal.impldep.org.eclipse.jgit.annotations.NonNull;
 import org.xbill.DNS.ARecord;
 import org.xbill.DNS.Lookup;
 import org.xbill.DNS.Record;
@@ -68,7 +67,7 @@ public final class StaticIpResolver {
     }
   }
 
-  private static @NonNull Lookup doLookup(@NonNull String hostname) throws UnknownHostException {
+  private static Lookup doLookup(String hostname) throws UnknownHostException {
     try {
       return new Lookup(hostname);
     } catch (Throwable e) {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
deleted file mode 100644
index fe26224fae..0000000000
--- a/buildSrc/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-apply plugin: 'java-gradle-plugin'
-
-repositories {
-    google()
-    mavenCentral()
-}
-
-dependencies {
-    implementation libs.dnsjava
-}
\ No newline at end of file
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
deleted file mode 100644
index 4e79e50209..0000000000
--- a/buildSrc/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-enableFeaturePreview('VERSION_CATALOGS')
-apply from: '../dependencies.gradle'