diff --git a/.gitmodules b/.gitmodules
index 1b5d66f..a25d9e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,5 +38,5 @@
 	path = components/pax-codecs
 	url = https://github.com/robotman2412/pax-codecs.git
 [submodule "main/pax-keyboard"]
-	path = main/pax-keyboard
+	path = components/pax-keyboard
 	url = https://github.com/robotman2412/pax-keyboard
diff --git a/README.md b/README.md
index 688937a..1b5c7f9 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ Source code included as submodules is licensed separately, please check the foll
 | Submodule                   | License                           | Author                                                 |
 |-----------------------------|-----------------------------------|--------------------------------------------------------|
 | esp-idf                     | Apache License 2.0                | Espressif Systems (Shanghai) CO LTD                    |
-| main/pax-keyboard           | MIT                               | Julian Scheffers                                       |
 | components/appfs            | THE BEER-WARE LICENSE Revision 42 | Jeroen Domburg <jeroen@spritesmods.com>                |
 | components/bus-i2c          | MIT                               | Nicolai Electronics                                    |
 | components/i2c-bno055       | MIT                               | Nicolai Electronics                                    |
 | components/mch2022-rp2040   | MIT                               | Renze Nicolai                                          |
 | components/pax-graphics     | MIT                               | Julian Scheffers                                       |
+| components/pax-keyboard     | MIT                               | Julian Scheffers                                       |
 | components/sdcard           | MIT                               | Nicolai Electronics                                    |
 | components/spi-ice40        | MIT                               | Nicolai Electronics                                    |
 | components/spi-ili9341      | MIT                               | Nicolai Electronics                                    |
diff --git a/components/pax-keyboard b/components/pax-keyboard
new file mode 160000
index 0000000..adad199
--- /dev/null
+++ b/components/pax-keyboard
@@ -0,0 +1 @@
+Subproject commit adad199c55e91f68d3e162b48f4e37816ef95c9a
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index b1b3ecc..bbb07a6 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -4,7 +4,6 @@ idf_component_register(
          "fpga_test.c"
          "graphics_wrapper.c"
          "menu.c"
-         "pax-keyboard/pax_keyboard.c"
          "rp2040_updater.c"
          "settings.c"
          "system_wrapper.c"
@@ -24,7 +23,6 @@ idf_component_register(
     INCLUDE_DIRS "."
                  "include"
                  "menus"
-                 "pax-keyboard"
     EMBED_TXTFILES ${project_dir}/resources/isrgrootx1.pem
     EMBED_FILES ${project_dir}/resources/wallpaper.png
                 ${project_dir}/resources/fpga_selftest.bin
diff --git a/main/pax-keyboard b/main/pax-keyboard
deleted file mode 160000
index daa81ea..0000000
--- a/main/pax-keyboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit daa81eafcea19628bda3ec2eb430544cd4f0b9d7