diff --git a/.gitmodules b/.gitmodules
index 1e870b49f..5c5feea51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "autodecompiler"]
 	path = autodecompiler
 	url = https://github.com/farisawan-2000/auto-decompiler
-[submodule "diff"]
-	path = diff
+[submodule "asm-differ"]
+	path = tools/asm-differ
 	url = https://github.com/simonlindholm/asm-differ
+[submodule "tools/decomp-permuter"]
+	path = tools/decomp-permuter
+	url = https://github.com/simonlindholm/decomp-permuter
diff --git a/autodecompiler b/autodecompiler
deleted file mode 160000
index 0c069ace4..000000000
--- a/autodecompiler
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c069ace4939c3814c4bced74f410be995966eac
diff --git a/diff b/diff
deleted file mode 160000
index c379de7d8..000000000
--- a/diff
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c379de7d88c37204f8a96fbc4b98abc700c5ae28
diff --git a/diff b/diff
new file mode 100755
index 000000000..7bd6152f5
--- /dev/null
+++ b/diff
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 tools/asm-differ/diff.py $1
diff --git a/diff_settings.py b/diff_settings.py
new file mode 100644
index 000000000..ee47f9533
--- /dev/null
+++ b/diff_settings.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+def add_custom_arguments(parser):
+    group = parser.add_mutually_exclusive_group(required=False)
+    group.add_argument('-u', dest='lang', action='store_const', const='us',
+            help="Set version to US.")
+
+def apply(config, args):
+    lang = args.lang or 'us'
+    config['mapfile'] = f'build/{lang}/mk64.{lang}.map'
+    config['myimg'] = f'build/{lang}/mk64.{lang}.z64'
+    config['baseimg'] = f'baserom.{lang}.z64'
+    config['makeflags'] = [f'VERSION={lang}']
+    config['source_directories'] = ['.']
+
+
diff --git a/import b/import
new file mode 100644
index 000000000..7b205d0ba
--- /dev/null
+++ b/import
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+python3 tools/decomp-permuter/import.py $1
+
diff --git a/permuter b/permuter
new file mode 100644
index 000000000..fa8461f65
--- /dev/null
+++ b/permuter
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+python3 tools/decomp-permuter/permuter.py $1
+
diff --git a/tools/asm-differ b/tools/asm-differ
new file mode 160000
index 000000000..c379de7d8
--- /dev/null
+++ b/tools/asm-differ
@@ -0,0 +1 @@
+Subproject commit c379de7d88c37204f8a96fbc4b98abc700c5ae28
diff --git a/tools/decomp-permuter b/tools/decomp-permuter
new file mode 160000
index 000000000..2420458ba
--- /dev/null
+++ b/tools/decomp-permuter
@@ -0,0 +1 @@
+Subproject commit 2420458ba7ed130df82e4393b8e0ba3d222aa336