diff --git a/app/drivers/gpio/CMakeLists.txt b/app/drivers/gpio/CMakeLists.txt
index b879b238..427d002c 100644
--- a/app/drivers/gpio/CMakeLists.txt
+++ b/app/drivers/gpio/CMakeLists.txt
@@ -1,8 +1,4 @@
-# Copyright (c) 2020 The ZMK Contributors
+# Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-zephyr_library_named(zmk__drivers__gpio)
-zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
-
-zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
-zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)
+add_subdirectory_ifdef(CONFIG_GPIO_MCP23017 mcp23017)
diff --git a/app/drivers/gpio/Kconfig b/app/drivers/gpio/Kconfig
index 09f9609f..120592ad 100644
--- a/app/drivers/gpio/Kconfig
+++ b/app/drivers/gpio/Kconfig
@@ -1 +1 @@
-rsource "Kconfig.mcp23017"
+rsource "mcp23017/Kconfig"
diff --git a/app/drivers/gpio/mcp23017/CMakeLists.txt b/app/drivers/gpio/mcp23017/CMakeLists.txt
new file mode 100644
index 00000000..b879b238
--- /dev/null
+++ b/app/drivers/gpio/mcp23017/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+zephyr_library_named(zmk__drivers__gpio)
+zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
+
+zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
+zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)
diff --git a/app/drivers/gpio/Kconfig.mcp23017 b/app/drivers/gpio/mcp23017/Kconfig
similarity index 100%
rename from app/drivers/gpio/Kconfig.mcp23017
rename to app/drivers/gpio/mcp23017/Kconfig
diff --git a/app/drivers/gpio/gpio_mcp23017.c b/app/drivers/gpio/mcp23017/gpio_mcp23017.c
similarity index 100%
rename from app/drivers/gpio/gpio_mcp23017.c
rename to app/drivers/gpio/mcp23017/gpio_mcp23017.c
diff --git a/app/drivers/gpio/gpio_mcp23017.h b/app/drivers/gpio/mcp23017/gpio_mcp23017.h
similarity index 100%
rename from app/drivers/gpio/gpio_mcp23017.h
rename to app/drivers/gpio/mcp23017/gpio_mcp23017.h