diff --git a/buffyboard/lv_drivers b/buffyboard/lv_drivers
deleted file mode 160000
index 33983bc..0000000
--- a/buffyboard/lv_drivers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33983bcb0a9bfd0a4cf44dba67617b9f537e76f3
diff --git a/buffyboard/lvgl b/buffyboard/lvgl
deleted file mode 160000
index a2b555e..0000000
--- a/buffyboard/lvgl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2b555e096f7d401b5d8e877a6b5e81ff81c747a
diff --git a/COPYING b/other/COPYING
similarity index 100%
rename from COPYING
rename to other/COPYING
diff --git a/README.md b/other/README.md
similarity index 100%
rename from README.md
rename to other/README.md
diff --git a/buffyboard/COPYING b/other/buffyboard/COPYING
similarity index 100%
rename from buffyboard/COPYING
rename to other/buffyboard/COPYING
diff --git a/buffyboard/FontAwesome5-Solid+Brands+Regular.woff b/other/buffyboard/FontAwesome5-Solid+Brands+Regular.woff
similarity index 100%
rename from buffyboard/FontAwesome5-Solid+Brands+Regular.woff
rename to other/buffyboard/FontAwesome5-Solid+Brands+Regular.woff
diff --git a/buffyboard/Montserrat-Regular.ttf b/other/buffyboard/Montserrat-Regular.ttf
similarity index 100%
rename from buffyboard/Montserrat-Regular.ttf
rename to other/buffyboard/Montserrat-Regular.ttf
diff --git a/buffyboard/OpenSans-Regular.ttf b/other/buffyboard/OpenSans-Regular.ttf
similarity index 100%
rename from buffyboard/OpenSans-Regular.ttf
rename to other/buffyboard/OpenSans-Regular.ttf
diff --git a/buffyboard/README.md b/other/buffyboard/README.md
similarity index 100%
rename from buffyboard/README.md
rename to other/buffyboard/README.md
diff --git a/buffyboard/buffyboard.h b/other/buffyboard/buffyboard.h
similarity index 100%
rename from buffyboard/buffyboard.h
rename to other/buffyboard/buffyboard.h
diff --git a/buffyboard/command_line.c b/other/buffyboard/command_line.c
similarity index 100%
rename from buffyboard/command_line.c
rename to other/buffyboard/command_line.c
diff --git a/buffyboard/command_line.h b/other/buffyboard/command_line.h
similarity index 100%
rename from buffyboard/command_line.h
rename to other/buffyboard/command_line.h
diff --git a/buffyboard/cursor.c b/other/buffyboard/cursor.c
similarity index 100%
rename from buffyboard/cursor.c
rename to other/buffyboard/cursor.c
diff --git a/buffyboard/cursor.h b/other/buffyboard/cursor.h
similarity index 100%
rename from buffyboard/cursor.h
rename to other/buffyboard/cursor.h
diff --git a/buffyboard/find-lvgl-sources.sh b/other/buffyboard/find-lvgl-sources.sh
similarity index 100%
rename from buffyboard/find-lvgl-sources.sh
rename to other/buffyboard/find-lvgl-sources.sh
diff --git a/buffyboard/font_32.c b/other/buffyboard/font_32.c
similarity index 100%
rename from buffyboard/font_32.c
rename to other/buffyboard/font_32.c
diff --git a/buffyboard/indev.c b/other/buffyboard/indev.c
similarity index 100%
rename from buffyboard/indev.c
rename to other/buffyboard/indev.c
diff --git a/buffyboard/indev.h b/other/buffyboard/indev.h
similarity index 100%
rename from buffyboard/indev.h
rename to other/buffyboard/indev.h
diff --git a/buffyboard/lv_conf.h b/other/buffyboard/lv_conf.h
similarity index 100%
rename from buffyboard/lv_conf.h
rename to other/buffyboard/lv_conf.h
diff --git a/buffyboard/lv_drv_conf.h b/other/buffyboard/lv_drv_conf.h
similarity index 100%
rename from buffyboard/lv_drv_conf.h
rename to other/buffyboard/lv_drv_conf.h
diff --git a/buffyboard/main.c b/other/buffyboard/main.c
similarity index 100%
rename from buffyboard/main.c
rename to other/buffyboard/main.c
diff --git a/buffyboard/meson.build b/other/buffyboard/meson.build
similarity index 100%
rename from buffyboard/meson.build
rename to other/buffyboard/meson.build
diff --git a/buffyboard/regenerate-layouts.sh b/other/buffyboard/regenerate-layouts.sh
similarity index 100%
rename from buffyboard/regenerate-layouts.sh
rename to other/buffyboard/regenerate-layouts.sh
diff --git a/buffyboard/sq2lv_layouts.c b/other/buffyboard/sq2lv_layouts.c
similarity index 100%
rename from buffyboard/sq2lv_layouts.c
rename to other/buffyboard/sq2lv_layouts.c
diff --git a/buffyboard/sq2lv_layouts.h b/other/buffyboard/sq2lv_layouts.h
similarity index 100%
rename from buffyboard/sq2lv_layouts.h
rename to other/buffyboard/sq2lv_layouts.h
diff --git a/buffyboard/terminal.c b/other/buffyboard/terminal.c
similarity index 100%
rename from buffyboard/terminal.c
rename to other/buffyboard/terminal.c
diff --git a/buffyboard/terminal.h b/other/buffyboard/terminal.h
similarity index 100%
rename from buffyboard/terminal.h
rename to other/buffyboard/terminal.h
diff --git a/buffyboard/uinput_device.c b/other/buffyboard/uinput_device.c
similarity index 100%
rename from buffyboard/uinput_device.c
rename to other/buffyboard/uinput_device.c
diff --git a/buffyboard/uinput_device.h b/other/buffyboard/uinput_device.h
similarity index 100%
rename from buffyboard/uinput_device.h
rename to other/buffyboard/uinput_device.h
diff --git a/squeek2lvgl/COPYING b/other/squeek2lvgl/COPYING
similarity index 100%
rename from squeek2lvgl/COPYING
rename to other/squeek2lvgl/COPYING
diff --git a/squeek2lvgl/Pipfile b/other/squeek2lvgl/Pipfile
similarity index 100%
rename from squeek2lvgl/Pipfile
rename to other/squeek2lvgl/Pipfile
diff --git a/squeek2lvgl/README.md b/other/squeek2lvgl/README.md
similarity index 100%
rename from squeek2lvgl/README.md
rename to other/squeek2lvgl/README.md
diff --git a/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/other/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
similarity index 100%
rename from squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
rename to other/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
diff --git a/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.h b/other/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.h
similarity index 100%
rename from squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.h
rename to other/squeek2lvgl/examples/de-with-custom-shift-keycap/sq2lv_layouts.h
diff --git a/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.c b/other/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.c
similarity index 100%
rename from squeek2lvgl/examples/es+fr+us/sq2lv_layouts.c
rename to other/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.c
diff --git a/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.h b/other/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.h
similarity index 100%
rename from squeek2lvgl/examples/es+fr+us/sq2lv_layouts.h
rename to other/squeek2lvgl/examples/es+fr+us/sq2lv_layouts.h
diff --git a/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/other/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.c
similarity index 100%
rename from squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.c
rename to other/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.c
diff --git a/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/other/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.h
similarity index 100%
rename from squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.h
rename to other/squeek2lvgl/examples/us-terminal-with-scancodes/sq2lv_layouts.h
diff --git a/squeek2lvgl/examples/us/sq2lv_layouts.c b/other/squeek2lvgl/examples/us/sq2lv_layouts.c
similarity index 100%
rename from squeek2lvgl/examples/us/sq2lv_layouts.c
rename to other/squeek2lvgl/examples/us/sq2lv_layouts.c
diff --git a/squeek2lvgl/examples/us/sq2lv_layouts.h b/other/squeek2lvgl/examples/us/sq2lv_layouts.h
similarity index 100%
rename from squeek2lvgl/examples/us/sq2lv_layouts.h
rename to other/squeek2lvgl/examples/us/sq2lv_layouts.h
diff --git a/squeek2lvgl/regenerate-examples.sh b/other/squeek2lvgl/regenerate-examples.sh
similarity index 100%
rename from squeek2lvgl/regenerate-examples.sh
rename to other/squeek2lvgl/regenerate-examples.sh
diff --git a/squeek2lvgl/sq2lv.c b/other/squeek2lvgl/sq2lv.c
similarity index 100%
rename from squeek2lvgl/sq2lv.c
rename to other/squeek2lvgl/sq2lv.c
diff --git a/squeek2lvgl/sq2lv.h b/other/squeek2lvgl/sq2lv.h
similarity index 100%
rename from squeek2lvgl/sq2lv.h
rename to other/squeek2lvgl/sq2lv.h
diff --git a/squeek2lvgl/squeek2lvgl.py b/other/squeek2lvgl/squeek2lvgl.py
similarity index 100%
rename from squeek2lvgl/squeek2lvgl.py
rename to other/squeek2lvgl/squeek2lvgl.py