diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b3ebf84..557fac6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -78,7 +78,7 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: compile ch552 firmware
-        working-directory: hw/boards/mta1-usb-v1/ch552_fw
+        working-directory: hw/usb_interface/ch552_fw
         run: make
 
       - name: compile tp1 firmware
diff --git a/doc/toolchain_setup.md b/doc/toolchain_setup.md
index c11cece..37c93e5 100644
--- a/doc/toolchain_setup.md
+++ b/doc/toolchain_setup.md
@@ -194,4 +194,4 @@ with the CH552 microcontroller pre-programmed.
 
 Toolchain setup and build instructions for this firmware are detailed
 in the
-[ch552_fw directory](../hw/boards/mta1-usb-v1/ch552_fw/README.md)
+[ch552_fw directory](../hw/usb_interface/ch552_fw/README.md)
diff --git a/hw/production_test/README.md b/hw/production_test/README.md
index fa6f6ef..4dab613 100644
--- a/hw/production_test/README.md
+++ b/hw/production_test/README.md
@@ -319,7 +319,7 @@ instructions.
 ### CH552 firmware
 
 See the build instructions in the
-[ch552_fw](../boards/mta1-usb-v1/ch552_fw/README.md) directory.
+[ch552_fw](../usb_interface/ch552_fw/README.md) directory.
 
 ### Test Application gateware
 
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/.gitignore b/hw/usb_interface/ch552_fw/.gitignore
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/.gitignore
rename to hw/usb_interface/ch552_fw/.gitignore
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/LICENSE b/hw/usb_interface/ch552_fw/LICENSE
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/LICENSE
rename to hw/usb_interface/ch552_fw/LICENSE
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/Makefile b/hw/usb_interface/ch552_fw/Makefile
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/Makefile
rename to hw/usb_interface/ch552_fw/Makefile
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/Makefile.include b/hw/usb_interface/ch552_fw/Makefile.include
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/Makefile.include
rename to hw/usb_interface/ch552_fw/Makefile.include
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/README.md b/hw/usb_interface/ch552_fw/README.md
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/README.md
rename to hw/usb_interface/ch552_fw/README.md
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/baud rate calculator.ods b/hw/usb_interface/ch552_fw/baud rate calculator.ods
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/baud rate calculator.ods
rename to hw/usb_interface/ch552_fw/baud rate calculator.ods
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/encode_usb_strings.py b/hw/usb_interface/ch552_fw/encode_usb_strings.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/encode_usb_strings.py
rename to hw/usb_interface/ch552_fw/encode_usb_strings.py
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/include/ch554.h b/hw/usb_interface/ch552_fw/include/ch554.h
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/include/ch554.h
rename to hw/usb_interface/ch552_fw/include/ch554.h
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/include/ch554_usb.h b/hw/usb_interface/ch552_fw/include/ch554_usb.h
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/include/ch554_usb.h
rename to hw/usb_interface/ch552_fw/include/ch554_usb.h
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/include/debug.c b/hw/usb_interface/ch552_fw/include/debug.c
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/include/debug.c
rename to hw/usb_interface/ch552_fw/include/debug.c
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/include/debug.h b/hw/usb_interface/ch552_fw/include/debug.h
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/include/debug.h
rename to hw/usb_interface/ch552_fw/include/debug.h
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/inject_serial_number.py b/hw/usb_interface/ch552_fw/inject_serial_number.py
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/inject_serial_number.py
rename to hw/usb_interface/ch552_fw/inject_serial_number.py
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/main.c b/hw/usb_interface/ch552_fw/main.c
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/main.c
rename to hw/usb_interface/ch552_fw/main.c
diff --git a/hw/boards/mta1-usb-v1/ch552_fw/usb_strings.h b/hw/usb_interface/ch552_fw/usb_strings.h
similarity index 100%
rename from hw/boards/mta1-usb-v1/ch552_fw/usb_strings.h
rename to hw/usb_interface/ch552_fw/usb_strings.h