diff --git a/config/generic-numpad/Kconfig.defconfig b/config/boards/generic-numpad/Kconfig.defconfig similarity index 100% rename from config/generic-numpad/Kconfig.defconfig rename to config/boards/generic-numpad/Kconfig.defconfig diff --git a/config/generic-numpad/Kconfig.shield b/config/boards/generic-numpad/Kconfig.shield similarity index 100% rename from config/generic-numpad/Kconfig.shield rename to config/boards/generic-numpad/Kconfig.shield diff --git a/config/generic-numpad/boards/nice_nano_v2.overlay b/config/boards/generic-numpad/boards/nice_nano_v2.overlay similarity index 100% rename from config/generic-numpad/boards/nice_nano_v2.overlay rename to config/boards/generic-numpad/boards/nice_nano_v2.overlay diff --git a/config/generic-numpad/generic-numpad.conf b/config/boards/generic-numpad/generic-numpad.conf similarity index 100% rename from config/generic-numpad/generic-numpad.conf rename to config/boards/generic-numpad/generic-numpad.conf diff --git a/config/generic-numpad/generic-numpad.keymap b/config/boards/generic-numpad/generic-numpad.keymap similarity index 100% rename from config/generic-numpad/generic-numpad.keymap rename to config/boards/generic-numpad/generic-numpad.keymap diff --git a/config/generic-numpad/generic-numpad.overlay b/config/boards/generic-numpad/generic-numpad.overlay similarity index 100% rename from config/generic-numpad/generic-numpad.overlay rename to config/boards/generic-numpad/generic-numpad.overlay diff --git a/config/generic-numpad/generic-numpad.zmk.yml b/config/boards/generic-numpad/generic-numpad.zmk.yml similarity index 100% rename from config/generic-numpad/generic-numpad.zmk.yml rename to config/boards/generic-numpad/generic-numpad.zmk.yml