diff --git a/.gitmodules b/.gitmodules
index 5f6fbf3..4e35374 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
-[submodule "lv_drivers"]
-	path = lv_drivers
+[submodule "buffyboard/lv_drivers"]
+	path = buffyboard/lv_drivers
 	url = https://github.com/littlevgl/lv_drivers.git
-[submodule "lvgl"]
-	path = lvgl
+[submodule "buffyboard/lvgl"]
+	path = buffyboard/lvgl
 	url = https://github.com/littlevgl/lvgl.git
-[submodule "squeek2lvgl"]
-	path = squeek2lvgl
-	url = https://gitlab.com/cherrypicker/squeek2lvgl
diff --git a/buffyboard/lv_drivers b/buffyboard/lv_drivers
new file mode 160000
index 0000000..33983bc
--- /dev/null
+++ b/buffyboard/lv_drivers
@@ -0,0 +1 @@
+Subproject commit 33983bcb0a9bfd0a4cf44dba67617b9f537e76f3
diff --git a/buffyboard/lvgl b/buffyboard/lvgl
new file mode 160000
index 0000000..a2b555e
--- /dev/null
+++ b/buffyboard/lvgl
@@ -0,0 +1 @@
+Subproject commit a2b555e096f7d401b5d8e877a6b5e81ff81c747a
diff --git a/buffyboard/main.c b/buffyboard/main.c
index 68645d4..04839d2 100644
--- a/buffyboard/main.c
+++ b/buffyboard/main.c
@@ -30,7 +30,7 @@
 
 #include "lvgl/lvgl.h"
 
-#include "squeek2lvgl/sq2lv.h"
+#include "../squeek2lvgl/sq2lv.h"
 
 #include <limits.h>
 #include <signal.h>
diff --git a/buffyboard/meson.build b/buffyboard/meson.build
index bbe11c7..92854d1 100644
--- a/buffyboard/meson.build
+++ b/buffyboard/meson.build
@@ -38,7 +38,7 @@ buffyboard_sources = [
 ]
 
 squeek2lvgl_sources = [
-  'squeek2lvgl/sq2lv.c',
+  '../squeek2lvgl/sq2lv.c',
 ]
 
 lvgl_sources = run_command('find-lvgl-sources.sh', 'lvgl').stdout().strip().split('\n')
diff --git a/buffyboard/regenerate-layouts.sh b/buffyboard/regenerate-layouts.sh
index 5451509..a245ec1 100755
--- a/buffyboard/regenerate-layouts.sh
+++ b/buffyboard/regenerate-layouts.sh
@@ -18,10 +18,11 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 
-cd squeek2lvgl
+cd ../squeek2lvgl
 pipenv install
 pipenv run python squeek2lvgl.py \
     --input terminal/us.yaml \
-    --output .. \
+    --name "US English (Terminal)" \
+    --output ../buffyboard \
     --generate-scancodes \
     --shift-keycap '\xef\x8d\x9b'