diff --git a/boards/amber/hello/defconfig b/boards/amber/configs/hello/defconfig
similarity index 100%
rename from boards/amber/hello/defconfig
rename to boards/amber/configs/hello/defconfig
diff --git a/boards/arduino-due/nsh/defconfig b/boards/arduino-due/configs/nsh/defconfig
similarity index 100%
rename from boards/arduino-due/nsh/defconfig
rename to boards/arduino-due/configs/nsh/defconfig
diff --git a/boards/arduino-mega2560/hello/defconfig b/boards/arduino-mega2560/configs/hello/defconfig
similarity index 100%
rename from boards/arduino-mega2560/hello/defconfig
rename to boards/arduino-mega2560/configs/hello/defconfig
diff --git a/boards/arduino-mega2560/nsh/defconfig b/boards/arduino-mega2560/configs/nsh/defconfig
similarity index 100%
rename from boards/arduino-mega2560/nsh/defconfig
rename to boards/arduino-mega2560/configs/nsh/defconfig
diff --git a/boards/avr32dev1/nsh/defconfig b/boards/avr32dev1/configs/nsh/defconfig
similarity index 100%
rename from boards/avr32dev1/nsh/defconfig
rename to boards/avr32dev1/configs/nsh/defconfig
diff --git a/boards/avr32dev1/ostest/defconfig b/boards/avr32dev1/configs/ostest/defconfig
similarity index 100%
rename from boards/avr32dev1/ostest/defconfig
rename to boards/avr32dev1/configs/ostest/defconfig
diff --git a/boards/axoloti/nsh/defconfig b/boards/axoloti/configs/nsh/defconfig
similarity index 100%
rename from boards/axoloti/nsh/defconfig
rename to boards/axoloti/configs/nsh/defconfig
diff --git a/boards/b-l072z-lrwan1/adc/defconfig b/boards/b-l072z-lrwan1/configs/adc/defconfig
similarity index 100%
rename from boards/b-l072z-lrwan1/adc/defconfig
rename to boards/b-l072z-lrwan1/configs/adc/defconfig
diff --git a/boards/b-l072z-lrwan1/nsh/defconfig b/boards/b-l072z-lrwan1/configs/nsh/defconfig
similarity index 100%
rename from boards/b-l072z-lrwan1/nsh/defconfig
rename to boards/b-l072z-lrwan1/configs/nsh/defconfig
diff --git a/boards/b-l072z-lrwan1/nxlines_oled/defconfig b/boards/b-l072z-lrwan1/configs/nxlines_oled/defconfig
similarity index 100%
rename from boards/b-l072z-lrwan1/nxlines_oled/defconfig
rename to boards/b-l072z-lrwan1/configs/nxlines_oled/defconfig
diff --git a/boards/b-l072z-lrwan1/sx127x/defconfig b/boards/b-l072z-lrwan1/configs/sx127x/defconfig
similarity index 100%
rename from boards/b-l072z-lrwan1/sx127x/defconfig
rename to boards/b-l072z-lrwan1/configs/sx127x/defconfig
diff --git a/boards/b-l475e-iot01a/nsh/defconfig b/boards/b-l475e-iot01a/configs/nsh/defconfig
similarity index 100%
rename from boards/b-l475e-iot01a/nsh/defconfig
rename to boards/b-l475e-iot01a/configs/nsh/defconfig
diff --git a/boards/b-l475e-iot01a/spirit-6lowpan/defconfig b/boards/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
similarity index 100%
rename from boards/b-l475e-iot01a/spirit-6lowpan/defconfig
rename to boards/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
diff --git a/boards/b-l475e-iot01a/spirit-starhub/defconfig b/boards/b-l475e-iot01a/configs/spirit-starhub/defconfig
similarity index 100%
rename from boards/b-l475e-iot01a/spirit-starhub/defconfig
rename to boards/b-l475e-iot01a/configs/spirit-starhub/defconfig
diff --git a/boards/b-l475e-iot01a/spirit-starpoint/defconfig b/boards/b-l475e-iot01a/configs/spirit-starpoint/defconfig
similarity index 100%
rename from boards/b-l475e-iot01a/spirit-starpoint/defconfig
rename to boards/b-l475e-iot01a/configs/spirit-starpoint/defconfig
diff --git a/boards/bambino-200e/knsh/defconfig b/boards/bambino-200e/configs/knsh/defconfig
similarity index 100%
rename from boards/bambino-200e/knsh/defconfig
rename to boards/bambino-200e/configs/knsh/defconfig
diff --git a/boards/bambino-200e/max31855/defconfig b/boards/bambino-200e/configs/max31855/defconfig
similarity index 100%
rename from boards/bambino-200e/max31855/defconfig
rename to boards/bambino-200e/configs/max31855/defconfig
diff --git a/boards/bambino-200e/netnsh/Make.defs b/boards/bambino-200e/configs/netnsh/Make.defs
similarity index 100%
rename from boards/bambino-200e/netnsh/Make.defs
rename to boards/bambino-200e/configs/netnsh/Make.defs
diff --git a/boards/bambino-200e/netnsh/defconfig b/boards/bambino-200e/configs/netnsh/defconfig
similarity index 100%
rename from boards/bambino-200e/netnsh/defconfig
rename to boards/bambino-200e/configs/netnsh/defconfig
diff --git a/boards/bambino-200e/nsh/defconfig b/boards/bambino-200e/configs/nsh/defconfig
similarity index 100%
rename from boards/bambino-200e/nsh/defconfig
rename to boards/bambino-200e/configs/nsh/defconfig
diff --git a/boards/bambino-200e/usbnsh/defconfig b/boards/bambino-200e/configs/usbnsh/defconfig
similarity index 100%
rename from boards/bambino-200e/usbnsh/defconfig
rename to boards/bambino-200e/configs/usbnsh/defconfig
diff --git a/boards/beaglebone-black/lcd/defconfig b/boards/beaglebone-black/configs/lcd/defconfig
similarity index 100%
rename from boards/beaglebone-black/lcd/defconfig
rename to boards/beaglebone-black/configs/lcd/defconfig
diff --git a/boards/beaglebone-black/nsh/defconfig b/boards/beaglebone-black/configs/nsh/defconfig
similarity index 100%
rename from boards/beaglebone-black/nsh/defconfig
rename to boards/beaglebone-black/configs/nsh/defconfig
diff --git a/boards/c5471evm/httpd/defconfig b/boards/c5471evm/configs/httpd/defconfig
similarity index 100%
rename from boards/c5471evm/httpd/defconfig
rename to boards/c5471evm/configs/httpd/defconfig
diff --git a/boards/c5471evm/nettest/defconfig b/boards/c5471evm/configs/nettest/defconfig
similarity index 100%
rename from boards/c5471evm/nettest/defconfig
rename to boards/c5471evm/configs/nettest/defconfig
diff --git a/boards/c5471evm/nsh/defconfig b/boards/c5471evm/configs/nsh/defconfig
similarity index 100%
rename from boards/c5471evm/nsh/defconfig
rename to boards/c5471evm/configs/nsh/defconfig
diff --git a/boards/clicker2-stm32/knsh/defconfig b/boards/clicker2-stm32/configs/knsh/defconfig
similarity index 100%
rename from boards/clicker2-stm32/knsh/defconfig
rename to boards/clicker2-stm32/configs/knsh/defconfig
diff --git a/boards/clicker2-stm32/mrf24j40-6lowpan/defconfig b/boards/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
similarity index 100%
rename from boards/clicker2-stm32/mrf24j40-6lowpan/defconfig
rename to boards/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
diff --git a/boards/clicker2-stm32/mrf24j40-mac/defconfig b/boards/clicker2-stm32/configs/mrf24j40-mac/defconfig
similarity index 100%
rename from boards/clicker2-stm32/mrf24j40-mac/defconfig
rename to boards/clicker2-stm32/configs/mrf24j40-mac/defconfig
diff --git a/boards/clicker2-stm32/mrf24j40-starhub/defconfig b/boards/clicker2-stm32/configs/mrf24j40-starhub/defconfig
similarity index 100%
rename from boards/clicker2-stm32/mrf24j40-starhub/defconfig
rename to boards/clicker2-stm32/configs/mrf24j40-starhub/defconfig
diff --git a/boards/clicker2-stm32/mrf24j40-starpoint/defconfig b/boards/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
similarity index 100%
rename from boards/clicker2-stm32/mrf24j40-starpoint/defconfig
rename to boards/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
diff --git a/boards/clicker2-stm32/nsh/defconfig b/boards/clicker2-stm32/configs/nsh/defconfig
similarity index 100%
rename from boards/clicker2-stm32/nsh/defconfig
rename to boards/clicker2-stm32/configs/nsh/defconfig
diff --git a/boards/clicker2-stm32/usbnsh/defconfig b/boards/clicker2-stm32/configs/usbnsh/defconfig
similarity index 100%
rename from boards/clicker2-stm32/usbnsh/defconfig
rename to boards/clicker2-stm32/configs/usbnsh/defconfig
diff --git a/boards/clicker2-stm32/xbee-6lowpan/defconfig b/boards/clicker2-stm32/configs/xbee-6lowpan/defconfig
similarity index 100%
rename from boards/clicker2-stm32/xbee-6lowpan/defconfig
rename to boards/clicker2-stm32/configs/xbee-6lowpan/defconfig
diff --git a/boards/cloudctrl/nsh/defconfig b/boards/cloudctrl/configs/nsh/defconfig
similarity index 100%
rename from boards/cloudctrl/nsh/defconfig
rename to boards/cloudctrl/configs/nsh/defconfig
diff --git a/boards/demo9s12ne64/ostest/defconfig b/boards/demo9s12ne64/configs/ostest/defconfig
similarity index 100%
rename from boards/demo9s12ne64/ostest/defconfig
rename to boards/demo9s12ne64/configs/ostest/defconfig
diff --git a/boards/dk-tm4c129x/ipv6/defconfig b/boards/dk-tm4c129x/configs/ipv6/defconfig
similarity index 100%
rename from boards/dk-tm4c129x/ipv6/defconfig
rename to boards/dk-tm4c129x/configs/ipv6/defconfig
diff --git a/boards/dk-tm4c129x/nsh/defconfig b/boards/dk-tm4c129x/configs/nsh/defconfig
similarity index 100%
rename from boards/dk-tm4c129x/nsh/defconfig
rename to boards/dk-tm4c129x/configs/nsh/defconfig
diff --git a/boards/ea3131/nsh/defconfig b/boards/ea3131/configs/nsh/defconfig
similarity index 100%
rename from boards/ea3131/nsh/defconfig
rename to boards/ea3131/configs/nsh/defconfig
diff --git a/boards/ea3131/pgnsh/Make.defs b/boards/ea3131/configs/pgnsh/Make.defs
similarity index 100%
rename from boards/ea3131/pgnsh/Make.defs
rename to boards/ea3131/configs/pgnsh/Make.defs
diff --git a/boards/ea3131/pgnsh/defconfig b/boards/ea3131/configs/pgnsh/defconfig
similarity index 100%
rename from boards/ea3131/pgnsh/defconfig
rename to boards/ea3131/configs/pgnsh/defconfig
diff --git a/boards/ea3131/usbserial/defconfig b/boards/ea3131/configs/usbserial/defconfig
similarity index 100%
rename from boards/ea3131/usbserial/defconfig
rename to boards/ea3131/configs/usbserial/defconfig
diff --git a/boards/ea3152/ostest/defconfig b/boards/ea3152/configs/ostest/defconfig
similarity index 100%
rename from boards/ea3152/ostest/defconfig
rename to boards/ea3152/configs/ostest/defconfig
diff --git a/boards/eagle100/httpd/defconfig b/boards/eagle100/configs/httpd/defconfig
similarity index 100%
rename from boards/eagle100/httpd/defconfig
rename to boards/eagle100/configs/httpd/defconfig
diff --git a/boards/eagle100/nettest/defconfig b/boards/eagle100/configs/nettest/defconfig
similarity index 100%
rename from boards/eagle100/nettest/defconfig
rename to boards/eagle100/configs/nettest/defconfig
diff --git a/boards/eagle100/nsh/defconfig b/boards/eagle100/configs/nsh/defconfig
similarity index 100%
rename from boards/eagle100/nsh/defconfig
rename to boards/eagle100/configs/nsh/defconfig
diff --git a/boards/eagle100/nxflat/defconfig b/boards/eagle100/configs/nxflat/defconfig
similarity index 100%
rename from boards/eagle100/nxflat/defconfig
rename to boards/eagle100/configs/nxflat/defconfig
diff --git a/boards/eagle100/thttpd/defconfig b/boards/eagle100/configs/thttpd/defconfig
similarity index 100%
rename from boards/eagle100/thttpd/defconfig
rename to boards/eagle100/configs/thttpd/defconfig
diff --git a/boards/efm32-g8xx-stk/nsh/defconfig b/boards/efm32-g8xx-stk/configs/nsh/defconfig
similarity index 100%
rename from boards/efm32-g8xx-stk/nsh/defconfig
rename to boards/efm32-g8xx-stk/configs/nsh/defconfig
diff --git a/boards/efm32gg-stk3700/nsh/defconfig b/boards/efm32gg-stk3700/configs/nsh/defconfig
similarity index 100%
rename from boards/efm32gg-stk3700/nsh/defconfig
rename to boards/efm32gg-stk3700/configs/nsh/defconfig
diff --git a/boards/ekk-lm3s9b96/nsh/defconfig b/boards/ekk-lm3s9b96/configs/nsh/defconfig
similarity index 100%
rename from boards/ekk-lm3s9b96/nsh/defconfig
rename to boards/ekk-lm3s9b96/configs/nsh/defconfig
diff --git a/boards/esp32-core/nsh/defconfig b/boards/esp32-core/configs/nsh/defconfig
similarity index 100%
rename from boards/esp32-core/nsh/defconfig
rename to boards/esp32-core/configs/nsh/defconfig
diff --git a/boards/esp32-core/ostest/defconfig b/boards/esp32-core/configs/ostest/defconfig
similarity index 100%
rename from boards/esp32-core/ostest/defconfig
rename to boards/esp32-core/configs/ostest/defconfig
diff --git a/boards/esp32-core/smp/defconfig b/boards/esp32-core/configs/smp/defconfig
similarity index 100%
rename from boards/esp32-core/smp/defconfig
rename to boards/esp32-core/configs/smp/defconfig
diff --git a/boards/ez80f910200kitg/ostest/.gitignore b/boards/ez80f910200kitg/configs/ostest/.gitignore
similarity index 100%
rename from boards/ez80f910200kitg/ostest/.gitignore
rename to boards/ez80f910200kitg/configs/ostest/.gitignore
diff --git a/boards/ez80f910200kitg/ostest/README.txt b/boards/ez80f910200kitg/configs/ostest/README.txt
similarity index 100%
rename from boards/ez80f910200kitg/ostest/README.txt
rename to boards/ez80f910200kitg/configs/ostest/README.txt
diff --git a/boards/ez80f910200kitg/ostest/defconfig b/boards/ez80f910200kitg/configs/ostest/defconfig
similarity index 100%
rename from boards/ez80f910200kitg/ostest/defconfig
rename to boards/ez80f910200kitg/configs/ostest/defconfig
diff --git a/boards/ez80f910200kitg/ostest/ostest.zdsproj b/boards/ez80f910200kitg/configs/ostest/ostest.zdsproj
similarity index 100%
rename from boards/ez80f910200kitg/ostest/ostest.zdsproj
rename to boards/ez80f910200kitg/configs/ostest/ostest.zdsproj
diff --git a/boards/ez80f910200zco/dhcpd/.gitignore b/boards/ez80f910200zco/configs/dhcpd/.gitignore
similarity index 100%
rename from boards/ez80f910200zco/dhcpd/.gitignore
rename to boards/ez80f910200zco/configs/dhcpd/.gitignore
diff --git a/boards/ez80f910200zco/dhcpd/README.txt b/boards/ez80f910200zco/configs/dhcpd/README.txt
similarity index 100%
rename from boards/ez80f910200zco/dhcpd/README.txt
rename to boards/ez80f910200zco/configs/dhcpd/README.txt
diff --git a/boards/ez80f910200zco/dhcpd/defconfig b/boards/ez80f910200zco/configs/dhcpd/defconfig
similarity index 100%
rename from boards/ez80f910200zco/dhcpd/defconfig
rename to boards/ez80f910200zco/configs/dhcpd/defconfig
diff --git a/boards/ez80f910200zco/dhcpd/dhcpd.zdsproj b/boards/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj
similarity index 100%
rename from boards/ez80f910200zco/dhcpd/dhcpd.zdsproj
rename to boards/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj
diff --git a/boards/ez80f910200zco/httpd/.gitignore b/boards/ez80f910200zco/configs/httpd/.gitignore
similarity index 100%
rename from boards/ez80f910200zco/httpd/.gitignore
rename to boards/ez80f910200zco/configs/httpd/.gitignore
diff --git a/boards/ez80f910200zco/httpd/README.txt b/boards/ez80f910200zco/configs/httpd/README.txt
similarity index 100%
rename from boards/ez80f910200zco/httpd/README.txt
rename to boards/ez80f910200zco/configs/httpd/README.txt
diff --git a/boards/ez80f910200zco/httpd/defconfig b/boards/ez80f910200zco/configs/httpd/defconfig
similarity index 100%
rename from boards/ez80f910200zco/httpd/defconfig
rename to boards/ez80f910200zco/configs/httpd/defconfig
diff --git a/boards/ez80f910200zco/httpd/httpd.zdsproj b/boards/ez80f910200zco/configs/httpd/httpd.zdsproj
similarity index 100%
rename from boards/ez80f910200zco/httpd/httpd.zdsproj
rename to boards/ez80f910200zco/configs/httpd/httpd.zdsproj
diff --git a/boards/ez80f910200zco/nettest/.gitignore b/boards/ez80f910200zco/configs/nettest/.gitignore
similarity index 100%
rename from boards/ez80f910200zco/nettest/.gitignore
rename to boards/ez80f910200zco/configs/nettest/.gitignore
diff --git a/boards/ez80f910200zco/nettest/README.txt b/boards/ez80f910200zco/configs/nettest/README.txt
similarity index 100%
rename from boards/ez80f910200zco/nettest/README.txt
rename to boards/ez80f910200zco/configs/nettest/README.txt
diff --git a/boards/ez80f910200zco/nettest/defconfig b/boards/ez80f910200zco/configs/nettest/defconfig
similarity index 100%
rename from boards/ez80f910200zco/nettest/defconfig
rename to boards/ez80f910200zco/configs/nettest/defconfig
diff --git a/boards/ez80f910200zco/nettest/nettest.zdsproj b/boards/ez80f910200zco/configs/nettest/nettest.zdsproj
similarity index 100%
rename from boards/ez80f910200zco/nettest/nettest.zdsproj
rename to boards/ez80f910200zco/configs/nettest/nettest.zdsproj
diff --git a/boards/ez80f910200zco/nsh/.gitignore b/boards/ez80f910200zco/configs/nsh/.gitignore
similarity index 100%
rename from boards/ez80f910200zco/nsh/.gitignore
rename to boards/ez80f910200zco/configs/nsh/.gitignore
diff --git a/boards/ez80f910200zco/nsh/README.txt b/boards/ez80f910200zco/configs/nsh/README.txt
similarity index 100%
rename from boards/ez80f910200zco/nsh/README.txt
rename to boards/ez80f910200zco/configs/nsh/README.txt
diff --git a/boards/ez80f910200zco/nsh/defconfig b/boards/ez80f910200zco/configs/nsh/defconfig
similarity index 100%
rename from boards/ez80f910200zco/nsh/defconfig
rename to boards/ez80f910200zco/configs/nsh/defconfig
diff --git a/boards/ez80f910200zco/nsh/nsh.zdsproj b/boards/ez80f910200zco/configs/nsh/nsh.zdsproj
similarity index 100%
rename from boards/ez80f910200zco/nsh/nsh.zdsproj
rename to boards/ez80f910200zco/configs/nsh/nsh.zdsproj
diff --git a/boards/ez80f910200zco/poll/.gitignore b/boards/ez80f910200zco/configs/poll/.gitignore
similarity index 100%
rename from boards/ez80f910200zco/poll/.gitignore
rename to boards/ez80f910200zco/configs/poll/.gitignore
diff --git a/boards/ez80f910200zco/poll/README.txt b/boards/ez80f910200zco/configs/poll/README.txt
similarity index 100%
rename from boards/ez80f910200zco/poll/README.txt
rename to boards/ez80f910200zco/configs/poll/README.txt
diff --git a/boards/ez80f910200zco/poll/defconfig b/boards/ez80f910200zco/configs/poll/defconfig
similarity index 100%
rename from boards/ez80f910200zco/poll/defconfig
rename to boards/ez80f910200zco/configs/poll/defconfig
diff --git a/boards/ez80f910200zco/poll/poll.zdsproj b/boards/ez80f910200zco/configs/poll/poll.zdsproj
similarity index 100%
rename from boards/ez80f910200zco/poll/poll.zdsproj
rename to boards/ez80f910200zco/configs/poll/poll.zdsproj
diff --git a/boards/fire-stm32v2/nsh/defconfig b/boards/fire-stm32v2/configs/nsh/defconfig
similarity index 100%
rename from boards/fire-stm32v2/nsh/defconfig
rename to boards/fire-stm32v2/configs/nsh/defconfig
diff --git a/boards/flipnclick-pic32mz/nsh/defconfig b/boards/flipnclick-pic32mz/configs/nsh/defconfig
similarity index 100%
rename from boards/flipnclick-pic32mz/nsh/defconfig
rename to boards/flipnclick-pic32mz/configs/nsh/defconfig
diff --git a/boards/flipnclick-pic32mz/nxlines/defconfig b/boards/flipnclick-pic32mz/configs/nxlines/defconfig
similarity index 100%
rename from boards/flipnclick-pic32mz/nxlines/defconfig
rename to boards/flipnclick-pic32mz/configs/nxlines/defconfig
diff --git a/boards/flipnclick-sam3x/nsh/defconfig b/boards/flipnclick-sam3x/configs/nsh/defconfig
similarity index 100%
rename from boards/flipnclick-sam3x/nsh/defconfig
rename to boards/flipnclick-sam3x/configs/nsh/defconfig
diff --git a/boards/flipnclick-sam3x/nxlines/defconfig b/boards/flipnclick-sam3x/configs/nxlines/defconfig
similarity index 100%
rename from boards/flipnclick-sam3x/nxlines/defconfig
rename to boards/flipnclick-sam3x/configs/nxlines/defconfig
diff --git a/boards/freedom-k28f/nsh/defconfig b/boards/freedom-k28f/configs/nsh/defconfig
similarity index 100%
rename from boards/freedom-k28f/nsh/defconfig
rename to boards/freedom-k28f/configs/nsh/defconfig
diff --git a/boards/freedom-k64f/netnsh/defconfig b/boards/freedom-k64f/configs/netnsh/defconfig
similarity index 100%
rename from boards/freedom-k64f/netnsh/defconfig
rename to boards/freedom-k64f/configs/netnsh/defconfig
diff --git a/boards/freedom-k64f/nsh/defconfig b/boards/freedom-k64f/configs/nsh/defconfig
similarity index 100%
rename from boards/freedom-k64f/nsh/defconfig
rename to boards/freedom-k64f/configs/nsh/defconfig
diff --git a/boards/freedom-k66f/netnsh/defconfig b/boards/freedom-k66f/configs/netnsh/defconfig
similarity index 100%
rename from boards/freedom-k66f/netnsh/defconfig
rename to boards/freedom-k66f/configs/netnsh/defconfig
diff --git a/boards/freedom-k66f/nsh/defconfig b/boards/freedom-k66f/configs/nsh/defconfig
similarity index 100%
rename from boards/freedom-k66f/nsh/defconfig
rename to boards/freedom-k66f/configs/nsh/defconfig
diff --git a/boards/freedom-kl25z/nsh/defconfig b/boards/freedom-kl25z/configs/nsh/defconfig
similarity index 100%
rename from boards/freedom-kl25z/nsh/defconfig
rename to boards/freedom-kl25z/configs/nsh/defconfig
diff --git a/boards/freedom-kl26z/nsh/defconfig b/boards/freedom-kl26z/configs/nsh/defconfig
similarity index 100%
rename from boards/freedom-kl26z/nsh/defconfig
rename to boards/freedom-kl26z/configs/nsh/defconfig
diff --git a/boards/gapuino/nsh/defconfig b/boards/gapuino/configs/nsh/defconfig
similarity index 100%
rename from boards/gapuino/nsh/defconfig
rename to boards/gapuino/configs/nsh/defconfig
diff --git a/boards/hymini-stm32v/nsh/defconfig b/boards/hymini-stm32v/configs/nsh/defconfig
similarity index 100%
rename from boards/hymini-stm32v/nsh/defconfig
rename to boards/hymini-stm32v/configs/nsh/defconfig
diff --git a/boards/hymini-stm32v/nsh2/defconfig b/boards/hymini-stm32v/configs/nsh2/defconfig
similarity index 100%
rename from boards/hymini-stm32v/nsh2/defconfig
rename to boards/hymini-stm32v/configs/nsh2/defconfig
diff --git a/boards/hymini-stm32v/usbmsc/defconfig b/boards/hymini-stm32v/configs/usbmsc/defconfig
similarity index 100%
rename from boards/hymini-stm32v/usbmsc/defconfig
rename to boards/hymini-stm32v/configs/usbmsc/defconfig
diff --git a/boards/hymini-stm32v/usbnsh/defconfig b/boards/hymini-stm32v/configs/usbnsh/defconfig
similarity index 100%
rename from boards/hymini-stm32v/usbnsh/defconfig
rename to boards/hymini-stm32v/configs/usbnsh/defconfig
diff --git a/boards/hymini-stm32v/usbserial/defconfig b/boards/hymini-stm32v/configs/usbserial/defconfig
similarity index 100%
rename from boards/hymini-stm32v/usbserial/defconfig
rename to boards/hymini-stm32v/configs/usbserial/defconfig
diff --git a/boards/imxrt1050-evk/knsh/Make.defs b/boards/imxrt1050-evk/configs/knsh/Make.defs
similarity index 100%
rename from boards/imxrt1050-evk/knsh/Make.defs
rename to boards/imxrt1050-evk/configs/knsh/Make.defs
diff --git a/boards/imxrt1050-evk/knsh/defconfig b/boards/imxrt1050-evk/configs/knsh/defconfig
similarity index 100%
rename from boards/imxrt1050-evk/knsh/defconfig
rename to boards/imxrt1050-evk/configs/knsh/defconfig
diff --git a/boards/imxrt1050-evk/libcxxtest/Make.defs b/boards/imxrt1050-evk/configs/libcxxtest/Make.defs
similarity index 100%
rename from boards/imxrt1050-evk/libcxxtest/Make.defs
rename to boards/imxrt1050-evk/configs/libcxxtest/Make.defs
diff --git a/boards/imxrt1050-evk/libcxxtest/defconfig b/boards/imxrt1050-evk/configs/libcxxtest/defconfig
similarity index 100%
rename from boards/imxrt1050-evk/libcxxtest/defconfig
rename to boards/imxrt1050-evk/configs/libcxxtest/defconfig
diff --git a/boards/imxrt1050-evk/netnsh/defconfig b/boards/imxrt1050-evk/configs/netnsh/defconfig
similarity index 100%
rename from boards/imxrt1050-evk/netnsh/defconfig
rename to boards/imxrt1050-evk/configs/netnsh/defconfig
diff --git a/boards/imxrt1050-evk/nsh/defconfig b/boards/imxrt1050-evk/configs/nsh/defconfig
similarity index 100%
rename from boards/imxrt1050-evk/nsh/defconfig
rename to boards/imxrt1050-evk/configs/nsh/defconfig
diff --git a/boards/imxrt1060-evk/knsh/Make.defs b/boards/imxrt1060-evk/configs/knsh/Make.defs
similarity index 100%
rename from boards/imxrt1060-evk/knsh/Make.defs
rename to boards/imxrt1060-evk/configs/knsh/Make.defs
diff --git a/boards/imxrt1060-evk/knsh/defconfig b/boards/imxrt1060-evk/configs/knsh/defconfig
similarity index 100%
rename from boards/imxrt1060-evk/knsh/defconfig
rename to boards/imxrt1060-evk/configs/knsh/defconfig
diff --git a/boards/imxrt1060-evk/libcxxtest/Make.defs b/boards/imxrt1060-evk/configs/libcxxtest/Make.defs
similarity index 100%
rename from boards/imxrt1060-evk/libcxxtest/Make.defs
rename to boards/imxrt1060-evk/configs/libcxxtest/Make.defs
diff --git a/boards/imxrt1060-evk/libcxxtest/defconfig b/boards/imxrt1060-evk/configs/libcxxtest/defconfig
similarity index 100%
rename from boards/imxrt1060-evk/libcxxtest/defconfig
rename to boards/imxrt1060-evk/configs/libcxxtest/defconfig
diff --git a/boards/imxrt1060-evk/netnsh/defconfig b/boards/imxrt1060-evk/configs/netnsh/defconfig
similarity index 100%
rename from boards/imxrt1060-evk/netnsh/defconfig
rename to boards/imxrt1060-evk/configs/netnsh/defconfig
diff --git a/boards/imxrt1060-evk/nsh/defconfig b/boards/imxrt1060-evk/configs/nsh/defconfig
similarity index 100%
rename from boards/imxrt1060-evk/nsh/defconfig
rename to boards/imxrt1060-evk/configs/nsh/defconfig
diff --git a/boards/kwikstik-k40/ostest/defconfig b/boards/kwikstik-k40/configs/ostest/defconfig
similarity index 100%
rename from boards/kwikstik-k40/ostest/defconfig
rename to boards/kwikstik-k40/configs/ostest/defconfig
diff --git a/boards/launchxl-cc1310/nsh/defconfig b/boards/launchxl-cc1310/configs/nsh/defconfig
similarity index 100%
rename from boards/launchxl-cc1310/nsh/defconfig
rename to boards/launchxl-cc1310/configs/nsh/defconfig
diff --git a/boards/launchxl-cc1312r1/nsh/defconfig b/boards/launchxl-cc1312r1/configs/nsh/defconfig
similarity index 100%
rename from boards/launchxl-cc1312r1/nsh/defconfig
rename to boards/launchxl-cc1312r1/configs/nsh/defconfig
diff --git a/boards/launchxl-tms57004/nsh/defconfig b/boards/launchxl-tms57004/configs/nsh/defconfig
similarity index 100%
rename from boards/launchxl-tms57004/nsh/defconfig
rename to boards/launchxl-tms57004/configs/nsh/defconfig
diff --git a/boards/lc823450-xgevk/audio/defconfig b/boards/lc823450-xgevk/configs/audio/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/audio/defconfig
rename to boards/lc823450-xgevk/configs/audio/defconfig
diff --git a/boards/lc823450-xgevk/bt/defconfig b/boards/lc823450-xgevk/configs/bt/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/bt/defconfig
rename to boards/lc823450-xgevk/configs/bt/defconfig
diff --git a/boards/lc823450-xgevk/elf/defconfig b/boards/lc823450-xgevk/configs/elf/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/elf/defconfig
rename to boards/lc823450-xgevk/configs/elf/defconfig
diff --git a/boards/lc823450-xgevk/ipl2/defconfig b/boards/lc823450-xgevk/configs/ipl2/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/ipl2/defconfig
rename to boards/lc823450-xgevk/configs/ipl2/defconfig
diff --git a/boards/lc823450-xgevk/knsh/defconfig b/boards/lc823450-xgevk/configs/knsh/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/knsh/defconfig
rename to boards/lc823450-xgevk/configs/knsh/defconfig
diff --git a/boards/lc823450-xgevk/kostest/defconfig b/boards/lc823450-xgevk/configs/kostest/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/kostest/defconfig
rename to boards/lc823450-xgevk/configs/kostest/defconfig
diff --git a/boards/lc823450-xgevk/krndis/defconfig b/boards/lc823450-xgevk/configs/krndis/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/krndis/defconfig
rename to boards/lc823450-xgevk/configs/krndis/defconfig
diff --git a/boards/lc823450-xgevk/nsh/defconfig b/boards/lc823450-xgevk/configs/nsh/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/nsh/defconfig
rename to boards/lc823450-xgevk/configs/nsh/defconfig
diff --git a/boards/lc823450-xgevk/posix_spawn/defconfig b/boards/lc823450-xgevk/configs/posix_spawn/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/posix_spawn/defconfig
rename to boards/lc823450-xgevk/configs/posix_spawn/defconfig
diff --git a/boards/lc823450-xgevk/rndis/defconfig b/boards/lc823450-xgevk/configs/rndis/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/rndis/defconfig
rename to boards/lc823450-xgevk/configs/rndis/defconfig
diff --git a/boards/lc823450-xgevk/usb/defconfig b/boards/lc823450-xgevk/configs/usb/defconfig
similarity index 100%
rename from boards/lc823450-xgevk/usb/defconfig
rename to boards/lc823450-xgevk/configs/usb/defconfig
diff --git a/boards/lincoln60/netnsh/defconfig b/boards/lincoln60/configs/netnsh/defconfig
similarity index 100%
rename from boards/lincoln60/netnsh/defconfig
rename to boards/lincoln60/configs/netnsh/defconfig
diff --git a/boards/lincoln60/nsh/defconfig b/boards/lincoln60/configs/nsh/defconfig
similarity index 100%
rename from boards/lincoln60/nsh/defconfig
rename to boards/lincoln60/configs/nsh/defconfig
diff --git a/boards/lincoln60/thttpd-binfs/defconfig b/boards/lincoln60/configs/thttpd-binfs/defconfig
similarity index 100%
rename from boards/lincoln60/thttpd-binfs/defconfig
rename to boards/lincoln60/configs/thttpd-binfs/defconfig
diff --git a/boards/lm3s6432-s2e/nsh/defconfig b/boards/lm3s6432-s2e/configs/nsh/defconfig
similarity index 100%
rename from boards/lm3s6432-s2e/nsh/defconfig
rename to boards/lm3s6432-s2e/configs/nsh/defconfig
diff --git a/boards/lm3s6965-ek/discover/defconfig b/boards/lm3s6965-ek/configs/discover/defconfig
similarity index 100%
rename from boards/lm3s6965-ek/discover/defconfig
rename to boards/lm3s6965-ek/configs/discover/defconfig
diff --git a/boards/lm3s6965-ek/nsh/defconfig b/boards/lm3s6965-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/lm3s6965-ek/nsh/defconfig
rename to boards/lm3s6965-ek/configs/nsh/defconfig
diff --git a/boards/lm3s6965-ek/nx/defconfig b/boards/lm3s6965-ek/configs/nx/defconfig
similarity index 100%
rename from boards/lm3s6965-ek/nx/defconfig
rename to boards/lm3s6965-ek/configs/nx/defconfig
diff --git a/boards/lm3s6965-ek/tcpecho/defconfig b/boards/lm3s6965-ek/configs/tcpecho/defconfig
similarity index 100%
rename from boards/lm3s6965-ek/tcpecho/defconfig
rename to boards/lm3s6965-ek/configs/tcpecho/defconfig
diff --git a/boards/lm3s8962-ek/nsh/defconfig b/boards/lm3s8962-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/lm3s8962-ek/nsh/defconfig
rename to boards/lm3s8962-ek/configs/nsh/defconfig
diff --git a/boards/lm3s8962-ek/nx/defconfig b/boards/lm3s8962-ek/configs/nx/defconfig
similarity index 100%
rename from boards/lm3s8962-ek/nx/defconfig
rename to boards/lm3s8962-ek/configs/nx/defconfig
diff --git a/boards/lm4f120-launchpad/nsh/defconfig b/boards/lm4f120-launchpad/configs/nsh/defconfig
similarity index 100%
rename from boards/lm4f120-launchpad/nsh/defconfig
rename to boards/lm4f120-launchpad/configs/nsh/defconfig
diff --git a/boards/lpc4088-devkit/knsh/Make.defs b/boards/lpc4088-devkit/configs/knsh/Make.defs
similarity index 100%
rename from boards/lpc4088-devkit/knsh/Make.defs
rename to boards/lpc4088-devkit/configs/knsh/Make.defs
diff --git a/boards/lpc4088-devkit/knsh/defconfig b/boards/lpc4088-devkit/configs/knsh/defconfig
similarity index 100%
rename from boards/lpc4088-devkit/knsh/defconfig
rename to boards/lpc4088-devkit/configs/knsh/defconfig
diff --git a/boards/lpc4088-devkit/nsh/defconfig b/boards/lpc4088-devkit/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4088-devkit/nsh/defconfig
rename to boards/lpc4088-devkit/configs/nsh/defconfig
diff --git a/boards/lpc4088-quickstart/knsh/Make.defs b/boards/lpc4088-quickstart/configs/knsh/Make.defs
similarity index 100%
rename from boards/lpc4088-quickstart/knsh/Make.defs
rename to boards/lpc4088-quickstart/configs/knsh/Make.defs
diff --git a/boards/lpc4088-quickstart/knsh/defconfig b/boards/lpc4088-quickstart/configs/knsh/defconfig
similarity index 100%
rename from boards/lpc4088-quickstart/knsh/defconfig
rename to boards/lpc4088-quickstart/configs/knsh/defconfig
diff --git a/boards/lpc4088-quickstart/nsh/defconfig b/boards/lpc4088-quickstart/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4088-quickstart/nsh/defconfig
rename to boards/lpc4088-quickstart/configs/nsh/defconfig
diff --git a/boards/lpc4330-xplorer/nsh/defconfig b/boards/lpc4330-xplorer/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4330-xplorer/nsh/defconfig
rename to boards/lpc4330-xplorer/configs/nsh/defconfig
diff --git a/boards/lpc4337-ws/nsh/defconfig b/boards/lpc4337-ws/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4337-ws/nsh/defconfig
rename to boards/lpc4337-ws/configs/nsh/defconfig
diff --git a/boards/lpc4357-evb/nsh/defconfig b/boards/lpc4357-evb/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4357-evb/nsh/defconfig
rename to boards/lpc4357-evb/configs/nsh/defconfig
diff --git a/boards/lpc4370-link2/nsh/defconfig b/boards/lpc4370-link2/configs/nsh/defconfig
similarity index 100%
rename from boards/lpc4370-link2/nsh/defconfig
rename to boards/lpc4370-link2/configs/nsh/defconfig
diff --git a/boards/lpcxpresso-lpc1768/dhcpd/defconfig b/boards/lpcxpresso-lpc1768/configs/dhcpd/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc1768/dhcpd/defconfig
rename to boards/lpcxpresso-lpc1768/configs/dhcpd/defconfig
diff --git a/boards/lpcxpresso-lpc1768/nsh/defconfig b/boards/lpcxpresso-lpc1768/configs/nsh/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc1768/nsh/defconfig
rename to boards/lpcxpresso-lpc1768/configs/nsh/defconfig
diff --git a/boards/lpcxpresso-lpc1768/nx/defconfig b/boards/lpcxpresso-lpc1768/configs/nx/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc1768/nx/defconfig
rename to boards/lpcxpresso-lpc1768/configs/nx/defconfig
diff --git a/boards/lpcxpresso-lpc1768/thttpd/Make.defs b/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
similarity index 100%
rename from boards/lpcxpresso-lpc1768/thttpd/Make.defs
rename to boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
diff --git a/boards/lpcxpresso-lpc1768/thttpd/defconfig b/boards/lpcxpresso-lpc1768/configs/thttpd/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc1768/thttpd/defconfig
rename to boards/lpcxpresso-lpc1768/configs/thttpd/defconfig
diff --git a/boards/lpcxpresso-lpc1768/usbmsc/defconfig b/boards/lpcxpresso-lpc1768/configs/usbmsc/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc1768/usbmsc/defconfig
rename to boards/lpcxpresso-lpc1768/configs/usbmsc/defconfig
diff --git a/boards/lpcxpresso-lpc54628/fb/defconfig b/boards/lpcxpresso-lpc54628/configs/fb/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/fb/defconfig
rename to boards/lpcxpresso-lpc54628/configs/fb/defconfig
diff --git a/boards/lpcxpresso-lpc54628/lvgl/defconfig b/boards/lpcxpresso-lpc54628/configs/lvgl/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/lvgl/defconfig
rename to boards/lpcxpresso-lpc54628/configs/lvgl/defconfig
diff --git a/boards/lpcxpresso-lpc54628/netnsh/defconfig b/boards/lpcxpresso-lpc54628/configs/netnsh/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/netnsh/defconfig
rename to boards/lpcxpresso-lpc54628/configs/netnsh/defconfig
diff --git a/boards/lpcxpresso-lpc54628/nsh/defconfig b/boards/lpcxpresso-lpc54628/configs/nsh/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/nsh/defconfig
rename to boards/lpcxpresso-lpc54628/configs/nsh/defconfig
diff --git a/boards/lpcxpresso-lpc54628/nxwm/defconfig b/boards/lpcxpresso-lpc54628/configs/nxwm/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/nxwm/defconfig
rename to boards/lpcxpresso-lpc54628/configs/nxwm/defconfig
diff --git a/boards/lpcxpresso-lpc54628/pwfb/defconfig b/boards/lpcxpresso-lpc54628/configs/pwfb/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/pwfb/defconfig
rename to boards/lpcxpresso-lpc54628/configs/pwfb/defconfig
diff --git a/boards/lpcxpresso-lpc54628/pwlines/defconfig b/boards/lpcxpresso-lpc54628/configs/pwlines/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/pwlines/defconfig
rename to boards/lpcxpresso-lpc54628/configs/pwlines/defconfig
diff --git a/boards/lpcxpresso-lpc54628/twm4nx1/defconfig b/boards/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/twm4nx1/defconfig
rename to boards/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
diff --git a/boards/lpcxpresso-lpc54628/twm4nx2/defconfig b/boards/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
similarity index 100%
rename from boards/lpcxpresso-lpc54628/twm4nx2/defconfig
rename to boards/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
diff --git a/boards/makerlisp/nsh_flash/.gitignore b/boards/makerlisp/configs/nsh_flash/.gitignore
similarity index 100%
rename from boards/makerlisp/nsh_flash/.gitignore
rename to boards/makerlisp/configs/nsh_flash/.gitignore
diff --git a/boards/makerlisp/nsh_flash/README.txt b/boards/makerlisp/configs/nsh_flash/README.txt
similarity index 100%
rename from boards/makerlisp/nsh_flash/README.txt
rename to boards/makerlisp/configs/nsh_flash/README.txt
diff --git a/boards/makerlisp/nsh_flash/defconfig b/boards/makerlisp/configs/nsh_flash/defconfig
similarity index 100%
rename from boards/makerlisp/nsh_flash/defconfig
rename to boards/makerlisp/configs/nsh_flash/defconfig
diff --git a/boards/makerlisp/nsh_flash/nsh.zdsproj b/boards/makerlisp/configs/nsh_flash/nsh.zdsproj
similarity index 100%
rename from boards/makerlisp/nsh_flash/nsh.zdsproj
rename to boards/makerlisp/configs/nsh_flash/nsh.zdsproj
diff --git a/boards/makerlisp/nsh_flash/nsh.zfpproj b/boards/makerlisp/configs/nsh_flash/nsh.zfpproj
similarity index 100%
rename from boards/makerlisp/nsh_flash/nsh.zfpproj
rename to boards/makerlisp/configs/nsh_flash/nsh.zfpproj
diff --git a/boards/makerlisp/nsh_flash/nsh_flash.ztgt b/boards/makerlisp/configs/nsh_flash/nsh_flash.ztgt
similarity index 100%
rename from boards/makerlisp/nsh_flash/nsh_flash.ztgt
rename to boards/makerlisp/configs/nsh_flash/nsh_flash.ztgt
diff --git a/boards/makerlisp/nsh_flash/nsh_ram.ztgt b/boards/makerlisp/configs/nsh_flash/nsh_ram.ztgt
similarity index 100%
rename from boards/makerlisp/nsh_flash/nsh_ram.ztgt
rename to boards/makerlisp/configs/nsh_flash/nsh_ram.ztgt
diff --git a/boards/makerlisp/nsh_ram/.gitignore b/boards/makerlisp/configs/nsh_ram/.gitignore
similarity index 100%
rename from boards/makerlisp/nsh_ram/.gitignore
rename to boards/makerlisp/configs/nsh_ram/.gitignore
diff --git a/boards/makerlisp/nsh_ram/README.txt b/boards/makerlisp/configs/nsh_ram/README.txt
similarity index 100%
rename from boards/makerlisp/nsh_ram/README.txt
rename to boards/makerlisp/configs/nsh_ram/README.txt
diff --git a/boards/makerlisp/nsh_ram/defconfig b/boards/makerlisp/configs/nsh_ram/defconfig
similarity index 100%
rename from boards/makerlisp/nsh_ram/defconfig
rename to boards/makerlisp/configs/nsh_ram/defconfig
diff --git a/boards/makerlisp/nsh_ram/nsh.zdsproj b/boards/makerlisp/configs/nsh_ram/nsh.zdsproj
similarity index 100%
rename from boards/makerlisp/nsh_ram/nsh.zdsproj
rename to boards/makerlisp/configs/nsh_ram/nsh.zdsproj
diff --git a/boards/makerlisp/nsh_ram/nsh.zfpproj b/boards/makerlisp/configs/nsh_ram/nsh.zfpproj
similarity index 100%
rename from boards/makerlisp/nsh_ram/nsh.zfpproj
rename to boards/makerlisp/configs/nsh_ram/nsh.zfpproj
diff --git a/boards/makerlisp/nsh_ram/nsh_flash.ztgt b/boards/makerlisp/configs/nsh_ram/nsh_flash.ztgt
similarity index 100%
rename from boards/makerlisp/nsh_ram/nsh_flash.ztgt
rename to boards/makerlisp/configs/nsh_ram/nsh_flash.ztgt
diff --git a/boards/makerlisp/nsh_ram/nsh_ram.ztgt b/boards/makerlisp/configs/nsh_ram/nsh_ram.ztgt
similarity index 100%
rename from boards/makerlisp/nsh_ram/nsh_ram.ztgt
rename to boards/makerlisp/configs/nsh_ram/nsh_ram.ztgt
diff --git a/boards/makerlisp/sdboot/.gitignore b/boards/makerlisp/configs/sdboot/.gitignore
similarity index 100%
rename from boards/makerlisp/sdboot/.gitignore
rename to boards/makerlisp/configs/sdboot/.gitignore
diff --git a/boards/makerlisp/sdboot/README.txt b/boards/makerlisp/configs/sdboot/README.txt
similarity index 100%
rename from boards/makerlisp/sdboot/README.txt
rename to boards/makerlisp/configs/sdboot/README.txt
diff --git a/boards/makerlisp/sdboot/defconfig b/boards/makerlisp/configs/sdboot/defconfig
similarity index 100%
rename from boards/makerlisp/sdboot/defconfig
rename to boards/makerlisp/configs/sdboot/defconfig
diff --git a/boards/makerlisp/sdboot/sdboot.zdsproj b/boards/makerlisp/configs/sdboot/sdboot.zdsproj
similarity index 100%
rename from boards/makerlisp/sdboot/sdboot.zdsproj
rename to boards/makerlisp/configs/sdboot/sdboot.zdsproj
diff --git a/boards/makerlisp/sdboot/sdboot.zfpproj b/boards/makerlisp/configs/sdboot/sdboot.zfpproj
similarity index 100%
rename from boards/makerlisp/sdboot/sdboot.zfpproj
rename to boards/makerlisp/configs/sdboot/sdboot.zfpproj
diff --git a/boards/makerlisp/sdboot/sdboot_flash.ztgt b/boards/makerlisp/configs/sdboot/sdboot_flash.ztgt
similarity index 100%
rename from boards/makerlisp/sdboot/sdboot_flash.ztgt
rename to boards/makerlisp/configs/sdboot/sdboot_flash.ztgt
diff --git a/boards/makerlisp/sdboot/sdboot_ram.ztgt b/boards/makerlisp/configs/sdboot/sdboot_ram.ztgt
similarity index 100%
rename from boards/makerlisp/sdboot/sdboot_ram.ztgt
rename to boards/makerlisp/configs/sdboot/sdboot_ram.ztgt
diff --git a/boards/maple/nsh/defconfig b/boards/maple/configs/nsh/defconfig
similarity index 100%
rename from boards/maple/nsh/defconfig
rename to boards/maple/configs/nsh/defconfig
diff --git a/boards/maple/nx/defconfig b/boards/maple/configs/nx/defconfig
similarity index 100%
rename from boards/maple/nx/defconfig
rename to boards/maple/configs/nx/defconfig
diff --git a/boards/maple/usbnsh/defconfig b/boards/maple/configs/usbnsh/defconfig
similarity index 100%
rename from boards/maple/usbnsh/defconfig
rename to boards/maple/configs/usbnsh/defconfig
diff --git a/boards/max32660-evsys/nsh/defconfig b/boards/max32660-evsys/configs/nsh/defconfig
similarity index 100%
rename from boards/max32660-evsys/nsh/defconfig
rename to boards/max32660-evsys/configs/nsh/defconfig
diff --git a/boards/mbed/nsh/defconfig b/boards/mbed/configs/nsh/defconfig
similarity index 100%
rename from boards/mbed/nsh/defconfig
rename to boards/mbed/configs/nsh/defconfig
diff --git a/boards/mcb1700/nsh/defconfig b/boards/mcb1700/configs/nsh/defconfig
similarity index 100%
rename from boards/mcb1700/nsh/defconfig
rename to boards/mcb1700/configs/nsh/defconfig
diff --git a/boards/mcu123-lpc214x/composite/defconfig b/boards/mcu123-lpc214x/configs/composite/defconfig
similarity index 100%
rename from boards/mcu123-lpc214x/composite/defconfig
rename to boards/mcu123-lpc214x/configs/composite/defconfig
diff --git a/boards/mcu123-lpc214x/nsh/defconfig b/boards/mcu123-lpc214x/configs/nsh/defconfig
similarity index 100%
rename from boards/mcu123-lpc214x/nsh/defconfig
rename to boards/mcu123-lpc214x/configs/nsh/defconfig
diff --git a/boards/mcu123-lpc214x/usbmsc/defconfig b/boards/mcu123-lpc214x/configs/usbmsc/defconfig
similarity index 100%
rename from boards/mcu123-lpc214x/usbmsc/defconfig
rename to boards/mcu123-lpc214x/configs/usbmsc/defconfig
diff --git a/boards/mcu123-lpc214x/usbserial/defconfig b/boards/mcu123-lpc214x/configs/usbserial/defconfig
similarity index 100%
rename from boards/mcu123-lpc214x/usbserial/defconfig
rename to boards/mcu123-lpc214x/configs/usbserial/defconfig
diff --git a/boards/metro-m4/nsh/defconfig b/boards/metro-m4/configs/nsh/defconfig
similarity index 100%
rename from boards/metro-m4/nsh/defconfig
rename to boards/metro-m4/configs/nsh/defconfig
diff --git a/boards/micropendous3/hello/defconfig b/boards/micropendous3/configs/hello/defconfig
similarity index 100%
rename from boards/micropendous3/hello/defconfig
rename to boards/micropendous3/configs/hello/defconfig
diff --git a/boards/mikroe-stm32f4/fulldemo/defconfig b/boards/mikroe-stm32f4/configs/fulldemo/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/fulldemo/defconfig
rename to boards/mikroe-stm32f4/configs/fulldemo/defconfig
diff --git a/boards/mikroe-stm32f4/kostest/defconfig b/boards/mikroe-stm32f4/configs/kostest/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/kostest/defconfig
rename to boards/mikroe-stm32f4/configs/kostest/defconfig
diff --git a/boards/mikroe-stm32f4/nsh/defconfig b/boards/mikroe-stm32f4/configs/nsh/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/nsh/defconfig
rename to boards/mikroe-stm32f4/configs/nsh/defconfig
diff --git a/boards/mikroe-stm32f4/nx/defconfig b/boards/mikroe-stm32f4/configs/nx/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/nx/defconfig
rename to boards/mikroe-stm32f4/configs/nx/defconfig
diff --git a/boards/mikroe-stm32f4/nxlines/defconfig b/boards/mikroe-stm32f4/configs/nxlines/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/nxlines/defconfig
rename to boards/mikroe-stm32f4/configs/nxlines/defconfig
diff --git a/boards/mikroe-stm32f4/nxtext/defconfig b/boards/mikroe-stm32f4/configs/nxtext/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/nxtext/defconfig
rename to boards/mikroe-stm32f4/configs/nxtext/defconfig
diff --git a/boards/mikroe-stm32f4/usbnsh/defconfig b/boards/mikroe-stm32f4/configs/usbnsh/defconfig
similarity index 100%
rename from boards/mikroe-stm32f4/usbnsh/defconfig
rename to boards/mikroe-stm32f4/configs/usbnsh/defconfig
diff --git a/boards/mirtoo/nsh/defconfig b/boards/mirtoo/configs/nsh/defconfig
similarity index 100%
rename from boards/mirtoo/nsh/defconfig
rename to boards/mirtoo/configs/nsh/defconfig
diff --git a/boards/mirtoo/nxffs/defconfig b/boards/mirtoo/configs/nxffs/defconfig
similarity index 100%
rename from boards/mirtoo/nxffs/defconfig
rename to boards/mirtoo/configs/nxffs/defconfig
diff --git a/boards/misoc/hello/defconfig b/boards/misoc/configs/hello/defconfig
similarity index 100%
rename from boards/misoc/hello/defconfig
rename to boards/misoc/configs/hello/defconfig
diff --git a/boards/misoc/nsh/defconfig b/boards/misoc/configs/nsh/defconfig
similarity index 100%
rename from boards/misoc/nsh/defconfig
rename to boards/misoc/configs/nsh/defconfig
diff --git a/boards/moteino-mega/hello/defconfig b/boards/moteino-mega/configs/hello/defconfig
similarity index 100%
rename from boards/moteino-mega/hello/defconfig
rename to boards/moteino-mega/configs/hello/defconfig
diff --git a/boards/moteino-mega/nsh/defconfig b/boards/moteino-mega/configs/nsh/defconfig
similarity index 100%
rename from boards/moteino-mega/nsh/defconfig
rename to boards/moteino-mega/configs/nsh/defconfig
diff --git a/boards/moxa/nsh/defconfig b/boards/moxa/configs/nsh/defconfig
similarity index 100%
rename from boards/moxa/nsh/defconfig
rename to boards/moxa/configs/nsh/defconfig
diff --git a/boards/ne64badge/ostest/defconfig b/boards/ne64badge/configs/ostest/defconfig
similarity index 100%
rename from boards/ne64badge/ostest/defconfig
rename to boards/ne64badge/configs/ostest/defconfig
diff --git a/boards/nr5m100-nexys4/nsh/defconfig b/boards/nr5m100-nexys4/configs/nsh/defconfig
similarity index 100%
rename from boards/nr5m100-nexys4/nsh/defconfig
rename to boards/nr5m100-nexys4/configs/nsh/defconfig
diff --git a/boards/nrf52-generic/feather-nsh/defconfig b/boards/nrf52-generic/configs/feather-nsh/defconfig
similarity index 100%
rename from boards/nrf52-generic/feather-nsh/defconfig
rename to boards/nrf52-generic/configs/feather-nsh/defconfig
diff --git a/boards/nrf52-generic/feather-userleds/defconfig b/boards/nrf52-generic/configs/feather-userleds/defconfig
similarity index 100%
rename from boards/nrf52-generic/feather-userleds/defconfig
rename to boards/nrf52-generic/configs/feather-userleds/defconfig
diff --git a/boards/nrf52-generic/pca10040-nsh/defconfig b/boards/nrf52-generic/configs/pca10040-nsh/defconfig
similarity index 100%
rename from boards/nrf52-generic/pca10040-nsh/defconfig
rename to boards/nrf52-generic/configs/pca10040-nsh/defconfig
diff --git a/boards/nrf52-generic/pca10040-wdog/defconfig b/boards/nrf52-generic/configs/pca10040-wdog/defconfig
similarity index 100%
rename from boards/nrf52-generic/pca10040-wdog/defconfig
rename to boards/nrf52-generic/configs/pca10040-wdog/defconfig
diff --git a/boards/ntosd-dm320/nettest/defconfig b/boards/ntosd-dm320/configs/nettest/defconfig
similarity index 100%
rename from boards/ntosd-dm320/nettest/defconfig
rename to boards/ntosd-dm320/configs/nettest/defconfig
diff --git a/boards/ntosd-dm320/nsh/defconfig b/boards/ntosd-dm320/configs/nsh/defconfig
similarity index 100%
rename from boards/ntosd-dm320/nsh/defconfig
rename to boards/ntosd-dm320/configs/nsh/defconfig
diff --git a/boards/ntosd-dm320/poll/defconfig b/boards/ntosd-dm320/configs/poll/defconfig
similarity index 100%
rename from boards/ntosd-dm320/poll/defconfig
rename to boards/ntosd-dm320/configs/poll/defconfig
diff --git a/boards/ntosd-dm320/udp/defconfig b/boards/ntosd-dm320/configs/udp/defconfig
similarity index 100%
rename from boards/ntosd-dm320/udp/defconfig
rename to boards/ntosd-dm320/configs/udp/defconfig
diff --git a/boards/ntosd-dm320/webserver/defconfig b/boards/ntosd-dm320/configs/webserver/defconfig
similarity index 100%
rename from boards/ntosd-dm320/webserver/defconfig
rename to boards/ntosd-dm320/configs/webserver/defconfig
diff --git a/boards/nucleo-144/f722-nsh/Make.defs b/boards/nucleo-144/configs/f722-nsh/Make.defs
similarity index 100%
rename from boards/nucleo-144/f722-nsh/Make.defs
rename to boards/nucleo-144/configs/f722-nsh/Make.defs
diff --git a/boards/nucleo-144/f722-nsh/defconfig b/boards/nucleo-144/configs/f722-nsh/defconfig
similarity index 100%
rename from boards/nucleo-144/f722-nsh/defconfig
rename to boards/nucleo-144/configs/f722-nsh/defconfig
diff --git a/boards/nucleo-144/f746-evalos/Make.defs b/boards/nucleo-144/configs/f746-evalos/Make.defs
similarity index 100%
rename from boards/nucleo-144/f746-evalos/Make.defs
rename to boards/nucleo-144/configs/f746-evalos/Make.defs
diff --git a/boards/nucleo-144/f746-evalos/defconfig b/boards/nucleo-144/configs/f746-evalos/defconfig
similarity index 100%
rename from boards/nucleo-144/f746-evalos/defconfig
rename to boards/nucleo-144/configs/f746-evalos/defconfig
diff --git a/boards/nucleo-144/f746-nsh/Make.defs b/boards/nucleo-144/configs/f746-nsh/Make.defs
similarity index 100%
rename from boards/nucleo-144/f746-nsh/Make.defs
rename to boards/nucleo-144/configs/f746-nsh/Make.defs
diff --git a/boards/nucleo-144/f746-nsh/defconfig b/boards/nucleo-144/configs/f746-nsh/defconfig
similarity index 100%
rename from boards/nucleo-144/f746-nsh/defconfig
rename to boards/nucleo-144/configs/f746-nsh/defconfig
diff --git a/boards/nucleo-144/f767-evalos/Make.defs b/boards/nucleo-144/configs/f767-evalos/Make.defs
similarity index 100%
rename from boards/nucleo-144/f767-evalos/Make.defs
rename to boards/nucleo-144/configs/f767-evalos/Make.defs
diff --git a/boards/nucleo-144/f767-evalos/defconfig b/boards/nucleo-144/configs/f767-evalos/defconfig
similarity index 100%
rename from boards/nucleo-144/f767-evalos/defconfig
rename to boards/nucleo-144/configs/f767-evalos/defconfig
diff --git a/boards/nucleo-144/f767-netnsh/Make.defs b/boards/nucleo-144/configs/f767-netnsh/Make.defs
similarity index 100%
rename from boards/nucleo-144/f767-netnsh/Make.defs
rename to boards/nucleo-144/configs/f767-netnsh/Make.defs
diff --git a/boards/nucleo-144/f767-netnsh/defconfig b/boards/nucleo-144/configs/f767-netnsh/defconfig
similarity index 100%
rename from boards/nucleo-144/f767-netnsh/defconfig
rename to boards/nucleo-144/configs/f767-netnsh/defconfig
diff --git a/boards/nucleo-144/f767-nsh/Make.defs b/boards/nucleo-144/configs/f767-nsh/Make.defs
similarity index 100%
rename from boards/nucleo-144/f767-nsh/Make.defs
rename to boards/nucleo-144/configs/f767-nsh/Make.defs
diff --git a/boards/nucleo-144/f767-nsh/defconfig b/boards/nucleo-144/configs/f767-nsh/defconfig
similarity index 100%
rename from boards/nucleo-144/f767-nsh/defconfig
rename to boards/nucleo-144/configs/f767-nsh/defconfig
diff --git a/boards/nucleo-f072rb/nsh/defconfig b/boards/nucleo-f072rb/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f072rb/nsh/defconfig
rename to boards/nucleo-f072rb/configs/nsh/defconfig
diff --git a/boards/nucleo-f091rc/nsh/defconfig b/boards/nucleo-f091rc/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f091rc/nsh/defconfig
rename to boards/nucleo-f091rc/configs/nsh/defconfig
diff --git a/boards/nucleo-f091rc/sx127x/defconfig b/boards/nucleo-f091rc/configs/sx127x/defconfig
similarity index 100%
rename from boards/nucleo-f091rc/sx127x/defconfig
rename to boards/nucleo-f091rc/configs/sx127x/defconfig
diff --git a/boards/nucleo-f103rb/adc/defconfig b/boards/nucleo-f103rb/configs/adc/defconfig
similarity index 100%
rename from boards/nucleo-f103rb/adc/defconfig
rename to boards/nucleo-f103rb/configs/adc/defconfig
diff --git a/boards/nucleo-f103rb/nsh/defconfig b/boards/nucleo-f103rb/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f103rb/nsh/defconfig
rename to boards/nucleo-f103rb/configs/nsh/defconfig
diff --git a/boards/nucleo-f103rb/pwm/defconfig b/boards/nucleo-f103rb/configs/pwm/defconfig
similarity index 100%
rename from boards/nucleo-f103rb/pwm/defconfig
rename to boards/nucleo-f103rb/configs/pwm/defconfig
diff --git a/boards/nucleo-f207zg/adc/defconfig b/boards/nucleo-f207zg/configs/adc/defconfig
similarity index 100%
rename from boards/nucleo-f207zg/adc/defconfig
rename to boards/nucleo-f207zg/configs/adc/defconfig
diff --git a/boards/nucleo-f207zg/nsh/defconfig b/boards/nucleo-f207zg/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f207zg/nsh/defconfig
rename to boards/nucleo-f207zg/configs/nsh/defconfig
diff --git a/boards/nucleo-f207zg/pwm/defconfig b/boards/nucleo-f207zg/configs/pwm/defconfig
similarity index 100%
rename from boards/nucleo-f207zg/pwm/defconfig
rename to boards/nucleo-f207zg/configs/pwm/defconfig
diff --git a/boards/nucleo-f302r8/highpri/defconfig b/boards/nucleo-f302r8/configs/highpri/defconfig
similarity index 100%
rename from boards/nucleo-f302r8/highpri/defconfig
rename to boards/nucleo-f302r8/configs/highpri/defconfig
diff --git a/boards/nucleo-f302r8/nsh/defconfig b/boards/nucleo-f302r8/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f302r8/nsh/defconfig
rename to boards/nucleo-f302r8/configs/nsh/defconfig
diff --git a/boards/nucleo-f303re/adc/defconfig b/boards/nucleo-f303re/configs/adc/defconfig
similarity index 100%
rename from boards/nucleo-f303re/adc/defconfig
rename to boards/nucleo-f303re/configs/adc/defconfig
diff --git a/boards/nucleo-f303re/can/defconfig b/boards/nucleo-f303re/configs/can/defconfig
similarity index 100%
rename from boards/nucleo-f303re/can/defconfig
rename to boards/nucleo-f303re/configs/can/defconfig
diff --git a/boards/nucleo-f303re/hello/defconfig b/boards/nucleo-f303re/configs/hello/defconfig
similarity index 100%
rename from boards/nucleo-f303re/hello/defconfig
rename to boards/nucleo-f303re/configs/hello/defconfig
diff --git a/boards/nucleo-f303re/nxlines/defconfig b/boards/nucleo-f303re/configs/nxlines/defconfig
similarity index 100%
rename from boards/nucleo-f303re/nxlines/defconfig
rename to boards/nucleo-f303re/configs/nxlines/defconfig
diff --git a/boards/nucleo-f303re/pwm/defconfig b/boards/nucleo-f303re/configs/pwm/defconfig
similarity index 100%
rename from boards/nucleo-f303re/pwm/defconfig
rename to boards/nucleo-f303re/configs/pwm/defconfig
diff --git a/boards/nucleo-f303re/serialrx/defconfig b/boards/nucleo-f303re/configs/serialrx/defconfig
similarity index 100%
rename from boards/nucleo-f303re/serialrx/defconfig
rename to boards/nucleo-f303re/configs/serialrx/defconfig
diff --git a/boards/nucleo-f303ze/adc/defconfig b/boards/nucleo-f303ze/configs/adc/defconfig
similarity index 100%
rename from boards/nucleo-f303ze/adc/defconfig
rename to boards/nucleo-f303ze/configs/adc/defconfig
diff --git a/boards/nucleo-f303ze/nsh/defconfig b/boards/nucleo-f303ze/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f303ze/nsh/defconfig
rename to boards/nucleo-f303ze/configs/nsh/defconfig
diff --git a/boards/nucleo-f303ze/nxlines_oled/defconfig b/boards/nucleo-f303ze/configs/nxlines_oled/defconfig
similarity index 100%
rename from boards/nucleo-f303ze/nxlines_oled/defconfig
rename to boards/nucleo-f303ze/configs/nxlines_oled/defconfig
diff --git a/boards/nucleo-f334r8/adc/defconfig b/boards/nucleo-f334r8/configs/adc/defconfig
similarity index 100%
rename from boards/nucleo-f334r8/adc/defconfig
rename to boards/nucleo-f334r8/configs/adc/defconfig
diff --git a/boards/nucleo-f334r8/highpri/defconfig b/boards/nucleo-f334r8/configs/highpri/defconfig
similarity index 100%
rename from boards/nucleo-f334r8/highpri/defconfig
rename to boards/nucleo-f334r8/configs/highpri/defconfig
diff --git a/boards/nucleo-f334r8/nsh/defconfig b/boards/nucleo-f334r8/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f334r8/nsh/defconfig
rename to boards/nucleo-f334r8/configs/nsh/defconfig
diff --git a/boards/nucleo-f334r8/spwm1/defconfig b/boards/nucleo-f334r8/configs/spwm1/defconfig
similarity index 100%
rename from boards/nucleo-f334r8/spwm1/defconfig
rename to boards/nucleo-f334r8/configs/spwm1/defconfig
diff --git a/boards/nucleo-f334r8/spwm2/defconfig b/boards/nucleo-f334r8/configs/spwm2/defconfig
similarity index 100%
rename from boards/nucleo-f334r8/spwm2/defconfig
rename to boards/nucleo-f334r8/configs/spwm2/defconfig
diff --git a/boards/nucleo-f410rb/nsh/defconfig b/boards/nucleo-f410rb/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f410rb/nsh/defconfig
rename to boards/nucleo-f410rb/configs/nsh/defconfig
diff --git a/boards/nucleo-f446re/nsh/defconfig b/boards/nucleo-f446re/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-f446re/nsh/defconfig
rename to boards/nucleo-f446re/configs/nsh/defconfig
diff --git a/boards/nucleo-f4x1re/f401-nsh/defconfig b/boards/nucleo-f4x1re/configs/f401-nsh/defconfig
similarity index 100%
rename from boards/nucleo-f4x1re/f401-nsh/defconfig
rename to boards/nucleo-f4x1re/configs/f401-nsh/defconfig
diff --git a/boards/nucleo-f4x1re/f411-nsh/defconfig b/boards/nucleo-f4x1re/configs/f411-nsh/defconfig
similarity index 100%
rename from boards/nucleo-f4x1re/f411-nsh/defconfig
rename to boards/nucleo-f4x1re/configs/f411-nsh/defconfig
diff --git a/boards/nucleo-g071rb/nsh/defconfig b/boards/nucleo-g071rb/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-g071rb/nsh/defconfig
rename to boards/nucleo-g071rb/configs/nsh/defconfig
diff --git a/boards/nucleo-h743zi/nsh/defconfig b/boards/nucleo-h743zi/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-h743zi/nsh/defconfig
rename to boards/nucleo-h743zi/configs/nsh/defconfig
diff --git a/boards/nucleo-h743zi/nxlines_oled/defconfig b/boards/nucleo-h743zi/configs/nxlines_oled/defconfig
similarity index 100%
rename from boards/nucleo-h743zi/nxlines_oled/defconfig
rename to boards/nucleo-h743zi/configs/nxlines_oled/defconfig
diff --git a/boards/nucleo-l073rz/nsh/defconfig b/boards/nucleo-l073rz/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l073rz/nsh/defconfig
rename to boards/nucleo-l073rz/configs/nsh/defconfig
diff --git a/boards/nucleo-l073rz/sx127x/defconfig b/boards/nucleo-l073rz/configs/sx127x/defconfig
similarity index 100%
rename from boards/nucleo-l073rz/sx127x/defconfig
rename to boards/nucleo-l073rz/configs/sx127x/defconfig
diff --git a/boards/nucleo-l152re/nsh/defconfig b/boards/nucleo-l152re/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l152re/nsh/defconfig
rename to boards/nucleo-l152re/configs/nsh/defconfig
diff --git a/boards/nucleo-l432kc/nsh/defconfig b/boards/nucleo-l432kc/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l432kc/nsh/defconfig
rename to boards/nucleo-l432kc/configs/nsh/defconfig
diff --git a/boards/nucleo-l452re/nsh/defconfig b/boards/nucleo-l452re/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l452re/nsh/defconfig
rename to boards/nucleo-l452re/configs/nsh/defconfig
diff --git a/boards/nucleo-l476rg/nsh/defconfig b/boards/nucleo-l476rg/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l476rg/nsh/defconfig
rename to boards/nucleo-l476rg/configs/nsh/defconfig
diff --git a/boards/nucleo-l476rg/nxdemo/defconfig b/boards/nucleo-l476rg/configs/nxdemo/defconfig
similarity index 100%
rename from boards/nucleo-l476rg/nxdemo/defconfig
rename to boards/nucleo-l476rg/configs/nxdemo/defconfig
diff --git a/boards/nucleo-l496zg/nsh/defconfig b/boards/nucleo-l496zg/configs/nsh/defconfig
similarity index 100%
rename from boards/nucleo-l496zg/nsh/defconfig
rename to boards/nucleo-l496zg/configs/nsh/defconfig
diff --git a/boards/nutiny-nuc120/nsh/defconfig b/boards/nutiny-nuc120/configs/nsh/defconfig
similarity index 100%
rename from boards/nutiny-nuc120/nsh/defconfig
rename to boards/nutiny-nuc120/configs/nsh/defconfig
diff --git a/boards/olimex-efm32g880f128-stk/nsh/defconfig b/boards/olimex-efm32g880f128-stk/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-efm32g880f128-stk/nsh/defconfig
rename to boards/olimex-efm32g880f128-stk/configs/nsh/defconfig
diff --git a/boards/olimex-lpc-h3131/nsh/defconfig b/boards/olimex-lpc-h3131/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-lpc-h3131/nsh/defconfig
rename to boards/olimex-lpc-h3131/configs/nsh/defconfig
diff --git a/boards/olimex-lpc1766stk/ftpc/defconfig b/boards/olimex-lpc1766stk/configs/ftpc/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/ftpc/defconfig
rename to boards/olimex-lpc1766stk/configs/ftpc/defconfig
diff --git a/boards/olimex-lpc1766stk/hidkbd/defconfig b/boards/olimex-lpc1766stk/configs/hidkbd/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/hidkbd/defconfig
rename to boards/olimex-lpc1766stk/configs/hidkbd/defconfig
diff --git a/boards/olimex-lpc1766stk/hidmouse/defconfig b/boards/olimex-lpc1766stk/configs/hidmouse/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/hidmouse/defconfig
rename to boards/olimex-lpc1766stk/configs/hidmouse/defconfig
diff --git a/boards/olimex-lpc1766stk/nettest/defconfig b/boards/olimex-lpc1766stk/configs/nettest/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/nettest/defconfig
rename to boards/olimex-lpc1766stk/configs/nettest/defconfig
diff --git a/boards/olimex-lpc1766stk/nsh/defconfig b/boards/olimex-lpc1766stk/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/nsh/defconfig
rename to boards/olimex-lpc1766stk/configs/nsh/defconfig
diff --git a/boards/olimex-lpc1766stk/slip-httpd/defconfig b/boards/olimex-lpc1766stk/configs/slip-httpd/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/slip-httpd/defconfig
rename to boards/olimex-lpc1766stk/configs/slip-httpd/defconfig
diff --git a/boards/olimex-lpc1766stk/thttpd-binfs/Make.defs b/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
similarity index 100%
rename from boards/olimex-lpc1766stk/thttpd-binfs/Make.defs
rename to boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
diff --git a/boards/olimex-lpc1766stk/thttpd-binfs/defconfig b/boards/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/thttpd-binfs/defconfig
rename to boards/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
diff --git a/boards/olimex-lpc1766stk/thttpd-nxflat/Make.defs b/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
similarity index 100%
rename from boards/olimex-lpc1766stk/thttpd-nxflat/Make.defs
rename to boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
diff --git a/boards/olimex-lpc1766stk/thttpd-nxflat/defconfig b/boards/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/thttpd-nxflat/defconfig
rename to boards/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
diff --git a/boards/olimex-lpc1766stk/usbmsc/defconfig b/boards/olimex-lpc1766stk/configs/usbmsc/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/usbmsc/defconfig
rename to boards/olimex-lpc1766stk/configs/usbmsc/defconfig
diff --git a/boards/olimex-lpc1766stk/usbserial/defconfig b/boards/olimex-lpc1766stk/configs/usbserial/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/usbserial/defconfig
rename to boards/olimex-lpc1766stk/configs/usbserial/defconfig
diff --git a/boards/olimex-lpc1766stk/zmodem/defconfig b/boards/olimex-lpc1766stk/configs/zmodem/defconfig
similarity index 100%
rename from boards/olimex-lpc1766stk/zmodem/defconfig
rename to boards/olimex-lpc1766stk/configs/zmodem/defconfig
diff --git a/boards/olimex-lpc2378/nsh/defconfig b/boards/olimex-lpc2378/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-lpc2378/nsh/defconfig
rename to boards/olimex-lpc2378/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-e407/bmp180/defconfig b/boards/olimex-stm32-e407/configs/bmp180/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/bmp180/defconfig
rename to boards/olimex-stm32-e407/configs/bmp180/defconfig
diff --git a/boards/olimex-stm32-e407/dac/defconfig b/boards/olimex-stm32-e407/configs/dac/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/dac/defconfig
rename to boards/olimex-stm32-e407/configs/dac/defconfig
diff --git a/boards/olimex-stm32-e407/discover/defconfig b/boards/olimex-stm32-e407/configs/discover/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/discover/defconfig
rename to boards/olimex-stm32-e407/configs/discover/defconfig
diff --git a/boards/olimex-stm32-e407/ina219/defconfig b/boards/olimex-stm32-e407/configs/ina219/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/ina219/defconfig
rename to boards/olimex-stm32-e407/configs/ina219/defconfig
diff --git a/boards/olimex-stm32-e407/mrf24j40-6lowpan/defconfig b/boards/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/mrf24j40-6lowpan/defconfig
rename to boards/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
diff --git a/boards/olimex-stm32-e407/mrf24j40-mac/defconfig b/boards/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/mrf24j40-mac/defconfig
rename to boards/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
diff --git a/boards/olimex-stm32-e407/netnsh/defconfig b/boards/olimex-stm32-e407/configs/netnsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/netnsh/defconfig
rename to boards/olimex-stm32-e407/configs/netnsh/defconfig
diff --git a/boards/olimex-stm32-e407/nsh/defconfig b/boards/olimex-stm32-e407/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/nsh/defconfig
rename to boards/olimex-stm32-e407/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-e407/telnetd/defconfig b/boards/olimex-stm32-e407/configs/telnetd/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/telnetd/defconfig
rename to boards/olimex-stm32-e407/configs/telnetd/defconfig
diff --git a/boards/olimex-stm32-e407/timer/defconfig b/boards/olimex-stm32-e407/configs/timer/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/timer/defconfig
rename to boards/olimex-stm32-e407/configs/timer/defconfig
diff --git a/boards/olimex-stm32-e407/usbnsh/defconfig b/boards/olimex-stm32-e407/configs/usbnsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/usbnsh/defconfig
rename to boards/olimex-stm32-e407/configs/usbnsh/defconfig
diff --git a/boards/olimex-stm32-e407/webserver/defconfig b/boards/olimex-stm32-e407/configs/webserver/defconfig
similarity index 100%
rename from boards/olimex-stm32-e407/webserver/defconfig
rename to boards/olimex-stm32-e407/configs/webserver/defconfig
diff --git a/boards/olimex-stm32-h405/usbnsh/defconfig b/boards/olimex-stm32-h405/configs/usbnsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-h405/usbnsh/defconfig
rename to boards/olimex-stm32-h405/configs/usbnsh/defconfig
diff --git a/boards/olimex-stm32-h407/nsh/defconfig b/boards/olimex-stm32-h407/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-h407/nsh/defconfig
rename to boards/olimex-stm32-h407/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-h407/nsh_uext/defconfig b/boards/olimex-stm32-h407/configs/nsh_uext/defconfig
similarity index 100%
rename from boards/olimex-stm32-h407/nsh_uext/defconfig
rename to boards/olimex-stm32-h407/configs/nsh_uext/defconfig
diff --git a/boards/olimex-stm32-p107/nsh/defconfig b/boards/olimex-stm32-p107/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-p107/nsh/defconfig
rename to boards/olimex-stm32-p107/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-p207/nsh/defconfig b/boards/olimex-stm32-p207/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-p207/nsh/defconfig
rename to boards/olimex-stm32-p207/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-p407/dhtxx/defconfig b/boards/olimex-stm32-p407/configs/dhtxx/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/dhtxx/defconfig
rename to boards/olimex-stm32-p407/configs/dhtxx/defconfig
diff --git a/boards/olimex-stm32-p407/hidkbd/defconfig b/boards/olimex-stm32-p407/configs/hidkbd/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/hidkbd/defconfig
rename to boards/olimex-stm32-p407/configs/hidkbd/defconfig
diff --git a/boards/olimex-stm32-p407/kelf/Make.defs b/boards/olimex-stm32-p407/configs/kelf/Make.defs
similarity index 100%
rename from boards/olimex-stm32-p407/kelf/Make.defs
rename to boards/olimex-stm32-p407/configs/kelf/Make.defs
diff --git a/boards/olimex-stm32-p407/kelf/defconfig b/boards/olimex-stm32-p407/configs/kelf/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/kelf/defconfig
rename to boards/olimex-stm32-p407/configs/kelf/defconfig
diff --git a/boards/olimex-stm32-p407/kmodule/Make.defs b/boards/olimex-stm32-p407/configs/kmodule/Make.defs
similarity index 100%
rename from boards/olimex-stm32-p407/kmodule/Make.defs
rename to boards/olimex-stm32-p407/configs/kmodule/Make.defs
diff --git a/boards/olimex-stm32-p407/kmodule/defconfig b/boards/olimex-stm32-p407/configs/kmodule/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/kmodule/defconfig
rename to boards/olimex-stm32-p407/configs/kmodule/defconfig
diff --git a/boards/olimex-stm32-p407/knsh/Make.defs b/boards/olimex-stm32-p407/configs/knsh/Make.defs
similarity index 100%
rename from boards/olimex-stm32-p407/knsh/Make.defs
rename to boards/olimex-stm32-p407/configs/knsh/Make.defs
diff --git a/boards/olimex-stm32-p407/knsh/defconfig b/boards/olimex-stm32-p407/configs/knsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/knsh/defconfig
rename to boards/olimex-stm32-p407/configs/knsh/defconfig
diff --git a/boards/olimex-stm32-p407/module/defconfig b/boards/olimex-stm32-p407/configs/module/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/module/defconfig
rename to boards/olimex-stm32-p407/configs/module/defconfig
diff --git a/boards/olimex-stm32-p407/nsh/defconfig b/boards/olimex-stm32-p407/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/nsh/defconfig
rename to boards/olimex-stm32-p407/configs/nsh/defconfig
diff --git a/boards/olimex-stm32-p407/zmodem/defconfig b/boards/olimex-stm32-p407/configs/zmodem/defconfig
similarity index 100%
rename from boards/olimex-stm32-p407/zmodem/defconfig
rename to boards/olimex-stm32-p407/configs/zmodem/defconfig
diff --git a/boards/olimex-strp711/nettest/defconfig b/boards/olimex-strp711/configs/nettest/defconfig
similarity index 100%
rename from boards/olimex-strp711/nettest/defconfig
rename to boards/olimex-strp711/configs/nettest/defconfig
diff --git a/boards/olimex-strp711/nsh/defconfig b/boards/olimex-strp711/configs/nsh/defconfig
similarity index 100%
rename from boards/olimex-strp711/nsh/defconfig
rename to boards/olimex-strp711/configs/nsh/defconfig
diff --git a/boards/olimexino-stm32/can/defconfig b/boards/olimexino-stm32/configs/can/defconfig
similarity index 100%
rename from boards/olimexino-stm32/can/defconfig
rename to boards/olimexino-stm32/configs/can/defconfig
diff --git a/boards/olimexino-stm32/composite/defconfig b/boards/olimexino-stm32/configs/composite/defconfig
similarity index 100%
rename from boards/olimexino-stm32/composite/defconfig
rename to boards/olimexino-stm32/configs/composite/defconfig
diff --git a/boards/olimexino-stm32/nsh/defconfig b/boards/olimexino-stm32/configs/nsh/defconfig
similarity index 100%
rename from boards/olimexino-stm32/nsh/defconfig
rename to boards/olimexino-stm32/configs/nsh/defconfig
diff --git a/boards/olimexino-stm32/smallnsh/defconfig b/boards/olimexino-stm32/configs/smallnsh/defconfig
similarity index 100%
rename from boards/olimexino-stm32/smallnsh/defconfig
rename to boards/olimexino-stm32/configs/smallnsh/defconfig
diff --git a/boards/olimexino-stm32/tiny/defconfig b/boards/olimexino-stm32/configs/tiny/defconfig
similarity index 100%
rename from boards/olimexino-stm32/tiny/defconfig
rename to boards/olimexino-stm32/configs/tiny/defconfig
diff --git a/boards/omnibusf4/nsh/defconfig b/boards/omnibusf4/configs/nsh/defconfig
similarity index 100%
rename from boards/omnibusf4/nsh/defconfig
rename to boards/omnibusf4/configs/nsh/defconfig
diff --git a/boards/open1788/fb/defconfig b/boards/open1788/configs/fb/defconfig
similarity index 100%
rename from boards/open1788/fb/defconfig
rename to boards/open1788/configs/fb/defconfig
diff --git a/boards/open1788/knsh/Make.defs b/boards/open1788/configs/knsh/Make.defs
similarity index 100%
rename from boards/open1788/knsh/Make.defs
rename to boards/open1788/configs/knsh/Make.defs
diff --git a/boards/open1788/knsh/defconfig b/boards/open1788/configs/knsh/defconfig
similarity index 100%
rename from boards/open1788/knsh/defconfig
rename to boards/open1788/configs/knsh/defconfig
diff --git a/boards/open1788/knxterm/Make.defs b/boards/open1788/configs/knxterm/Make.defs
similarity index 100%
rename from boards/open1788/knxterm/Make.defs
rename to boards/open1788/configs/knxterm/Make.defs
diff --git a/boards/open1788/knxterm/defconfig b/boards/open1788/configs/knxterm/defconfig
similarity index 100%
rename from boards/open1788/knxterm/defconfig
rename to boards/open1788/configs/knxterm/defconfig
diff --git a/boards/open1788/nsh/defconfig b/boards/open1788/configs/nsh/defconfig
similarity index 100%
rename from boards/open1788/nsh/defconfig
rename to boards/open1788/configs/nsh/defconfig
diff --git a/boards/open1788/nxlines/defconfig b/boards/open1788/configs/nxlines/defconfig
similarity index 100%
rename from boards/open1788/nxlines/defconfig
rename to boards/open1788/configs/nxlines/defconfig
diff --git a/boards/open1788/pdcurses/defconfig b/boards/open1788/configs/pdcurses/defconfig
similarity index 100%
rename from boards/open1788/pdcurses/defconfig
rename to boards/open1788/configs/pdcurses/defconfig
diff --git a/boards/open1788/pwfb/defconfig b/boards/open1788/configs/pwfb/defconfig
similarity index 100%
rename from boards/open1788/pwfb/defconfig
rename to boards/open1788/configs/pwfb/defconfig
diff --git a/boards/or1k/nsh/defconfig b/boards/or1k/configs/nsh/defconfig
similarity index 100%
rename from boards/or1k/nsh/defconfig
rename to boards/or1k/configs/nsh/defconfig
diff --git a/boards/p112/ostest/defconfig b/boards/p112/configs/ostest/defconfig
similarity index 100%
rename from boards/p112/ostest/defconfig
rename to boards/p112/configs/ostest/defconfig
diff --git a/boards/pcduino-a10/nsh/defconfig b/boards/pcduino-a10/configs/nsh/defconfig
similarity index 100%
rename from boards/pcduino-a10/nsh/defconfig
rename to boards/pcduino-a10/configs/nsh/defconfig
diff --git a/boards/pcduino-a10/nsh/pcduino-140107.patch b/boards/pcduino-a10/configs/nsh/pcduino-140107.patch
similarity index 100%
rename from boards/pcduino-a10/nsh/pcduino-140107.patch
rename to boards/pcduino-a10/configs/nsh/pcduino-140107.patch
diff --git a/boards/photon/nsh/defconfig b/boards/photon/configs/nsh/defconfig
similarity index 100%
rename from boards/photon/nsh/defconfig
rename to boards/photon/configs/nsh/defconfig
diff --git a/boards/photon/rgbled/defconfig b/boards/photon/configs/rgbled/defconfig
similarity index 100%
rename from boards/photon/rgbled/defconfig
rename to boards/photon/configs/rgbled/defconfig
diff --git a/boards/photon/usbnsh/defconfig b/boards/photon/configs/usbnsh/defconfig
similarity index 100%
rename from boards/photon/usbnsh/defconfig
rename to boards/photon/configs/usbnsh/defconfig
diff --git a/boards/photon/wlan/defconfig b/boards/photon/configs/wlan/defconfig
similarity index 100%
rename from boards/photon/wlan/defconfig
rename to boards/photon/configs/wlan/defconfig
diff --git a/boards/pic32mx-starterkit/nsh/defconfig b/boards/pic32mx-starterkit/configs/nsh/defconfig
similarity index 100%
rename from boards/pic32mx-starterkit/nsh/defconfig
rename to boards/pic32mx-starterkit/configs/nsh/defconfig
diff --git a/boards/pic32mx-starterkit/nsh2/defconfig b/boards/pic32mx-starterkit/configs/nsh2/defconfig
similarity index 100%
rename from boards/pic32mx-starterkit/nsh2/defconfig
rename to boards/pic32mx-starterkit/configs/nsh2/defconfig
diff --git a/boards/pic32mx7mmb/nsh/defconfig b/boards/pic32mx7mmb/configs/nsh/defconfig
similarity index 100%
rename from boards/pic32mx7mmb/nsh/defconfig
rename to boards/pic32mx7mmb/configs/nsh/defconfig
diff --git a/boards/pic32mz-starterkit/nsh/defconfig b/boards/pic32mz-starterkit/configs/nsh/defconfig
similarity index 100%
rename from boards/pic32mz-starterkit/nsh/defconfig
rename to boards/pic32mz-starterkit/configs/nsh/defconfig
diff --git a/boards/pnev5180b/knsh/Make.defs b/boards/pnev5180b/configs/knsh/Make.defs
similarity index 100%
rename from boards/pnev5180b/knsh/Make.defs
rename to boards/pnev5180b/configs/knsh/Make.defs
diff --git a/boards/pnev5180b/knsh/defconfig b/boards/pnev5180b/configs/knsh/defconfig
similarity index 100%
rename from boards/pnev5180b/knsh/defconfig
rename to boards/pnev5180b/configs/knsh/defconfig
diff --git a/boards/pnev5180b/nsh-cdcecm/defconfig b/boards/pnev5180b/configs/nsh-cdcecm/defconfig
similarity index 100%
rename from boards/pnev5180b/nsh-cdcecm/defconfig
rename to boards/pnev5180b/configs/nsh-cdcecm/defconfig
diff --git a/boards/pnev5180b/nsh/defconfig b/boards/pnev5180b/configs/nsh/defconfig
similarity index 100%
rename from boards/pnev5180b/nsh/defconfig
rename to boards/pnev5180b/configs/nsh/defconfig
diff --git a/boards/pnev5180b/usbnsh-cdcecm/defconfig b/boards/pnev5180b/configs/usbnsh-cdcecm/defconfig
similarity index 100%
rename from boards/pnev5180b/usbnsh-cdcecm/defconfig
rename to boards/pnev5180b/configs/usbnsh-cdcecm/defconfig
diff --git a/boards/pnev5180b/usbnsh/defconfig b/boards/pnev5180b/configs/usbnsh/defconfig
similarity index 100%
rename from boards/pnev5180b/usbnsh/defconfig
rename to boards/pnev5180b/configs/usbnsh/defconfig
diff --git a/boards/qemu-i486/nsh/defconfig b/boards/qemu-i486/configs/nsh/defconfig
similarity index 100%
rename from boards/qemu-i486/nsh/defconfig
rename to boards/qemu-i486/configs/nsh/defconfig
diff --git a/boards/qemu-i486/ostest/defconfig b/boards/qemu-i486/configs/ostest/defconfig
similarity index 100%
rename from boards/qemu-i486/ostest/defconfig
rename to boards/qemu-i486/configs/ostest/defconfig
diff --git a/boards/sabre-6quad/nsh/defconfig b/boards/sabre-6quad/configs/nsh/defconfig
similarity index 100%
rename from boards/sabre-6quad/nsh/defconfig
rename to boards/sabre-6quad/configs/nsh/defconfig
diff --git a/boards/sabre-6quad/smp/defconfig b/boards/sabre-6quad/configs/smp/defconfig
similarity index 100%
rename from boards/sabre-6quad/smp/defconfig
rename to boards/sabre-6quad/configs/smp/defconfig
diff --git a/boards/sam3u-ek/knsh/Make.defs b/boards/sam3u-ek/configs/knsh/Make.defs
similarity index 100%
rename from boards/sam3u-ek/knsh/Make.defs
rename to boards/sam3u-ek/configs/knsh/Make.defs
diff --git a/boards/sam3u-ek/knsh/defconfig b/boards/sam3u-ek/configs/knsh/defconfig
similarity index 100%
rename from boards/sam3u-ek/knsh/defconfig
rename to boards/sam3u-ek/configs/knsh/defconfig
diff --git a/boards/sam3u-ek/nsh/defconfig b/boards/sam3u-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/sam3u-ek/nsh/defconfig
rename to boards/sam3u-ek/configs/nsh/defconfig
diff --git a/boards/sam3u-ek/nx/defconfig b/boards/sam3u-ek/configs/nx/defconfig
similarity index 100%
rename from boards/sam3u-ek/nx/defconfig
rename to boards/sam3u-ek/configs/nx/defconfig
diff --git a/boards/sam3u-ek/nxwm/defconfig b/boards/sam3u-ek/configs/nxwm/defconfig
similarity index 100%
rename from boards/sam3u-ek/nxwm/defconfig
rename to boards/sam3u-ek/configs/nxwm/defconfig
diff --git a/boards/sam4cmp-db/nsh/defconfig b/boards/sam4cmp-db/configs/nsh/defconfig
similarity index 100%
rename from boards/sam4cmp-db/nsh/defconfig
rename to boards/sam4cmp-db/configs/nsh/defconfig
diff --git a/boards/sam4e-ek/nsh/defconfig b/boards/sam4e-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/sam4e-ek/nsh/defconfig
rename to boards/sam4e-ek/configs/nsh/defconfig
diff --git a/boards/sam4e-ek/nxwm/defconfig b/boards/sam4e-ek/configs/nxwm/defconfig
similarity index 100%
rename from boards/sam4e-ek/nxwm/defconfig
rename to boards/sam4e-ek/configs/nxwm/defconfig
diff --git a/boards/sam4e-ek/usbnsh/defconfig b/boards/sam4e-ek/configs/usbnsh/defconfig
similarity index 100%
rename from boards/sam4e-ek/usbnsh/defconfig
rename to boards/sam4e-ek/configs/usbnsh/defconfig
diff --git a/boards/sam4l-xplained/nsh/defconfig b/boards/sam4l-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/sam4l-xplained/nsh/defconfig
rename to boards/sam4l-xplained/configs/nsh/defconfig
diff --git a/boards/sam4s-xplained-pro/nsh/defconfig b/boards/sam4s-xplained-pro/configs/nsh/defconfig
similarity index 100%
rename from boards/sam4s-xplained-pro/nsh/defconfig
rename to boards/sam4s-xplained-pro/configs/nsh/defconfig
diff --git a/boards/sam4s-xplained/nsh/defconfig b/boards/sam4s-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/sam4s-xplained/nsh/defconfig
rename to boards/sam4s-xplained/configs/nsh/defconfig
diff --git a/boards/sama5d2-xult/nsh/defconfig b/boards/sama5d2-xult/configs/nsh/defconfig
similarity index 100%
rename from boards/sama5d2-xult/nsh/defconfig
rename to boards/sama5d2-xult/configs/nsh/defconfig
diff --git a/boards/sama5d3-xplained/bridge/defconfig b/boards/sama5d3-xplained/configs/bridge/defconfig
similarity index 100%
rename from boards/sama5d3-xplained/bridge/defconfig
rename to boards/sama5d3-xplained/configs/bridge/defconfig
diff --git a/boards/sama5d3-xplained/nsh/defconfig b/boards/sama5d3-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/sama5d3-xplained/nsh/defconfig
rename to boards/sama5d3-xplained/configs/nsh/defconfig
diff --git a/boards/sama5d3x-ek/demo/defconfig b/boards/sama5d3x-ek/configs/demo/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/demo/defconfig
rename to boards/sama5d3x-ek/configs/demo/defconfig
diff --git a/boards/sama5d3x-ek/hello/defconfig b/boards/sama5d3x-ek/configs/hello/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/hello/defconfig
rename to boards/sama5d3x-ek/configs/hello/defconfig
diff --git a/boards/sama5d3x-ek/norboot/defconfig b/boards/sama5d3x-ek/configs/norboot/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/norboot/defconfig
rename to boards/sama5d3x-ek/configs/norboot/defconfig
diff --git a/boards/sama5d3x-ek/nsh/defconfig b/boards/sama5d3x-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/nsh/defconfig
rename to boards/sama5d3x-ek/configs/nsh/defconfig
diff --git a/boards/sama5d3x-ek/nx/defconfig b/boards/sama5d3x-ek/configs/nx/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/nx/defconfig
rename to boards/sama5d3x-ek/configs/nx/defconfig
diff --git a/boards/sama5d3x-ek/nxplayer/defconfig b/boards/sama5d3x-ek/configs/nxplayer/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/nxplayer/defconfig
rename to boards/sama5d3x-ek/configs/nxplayer/defconfig
diff --git a/boards/sama5d3x-ek/nxwm/defconfig b/boards/sama5d3x-ek/configs/nxwm/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/nxwm/defconfig
rename to boards/sama5d3x-ek/configs/nxwm/defconfig
diff --git a/boards/sama5d3x-ek/ov2640/defconfig b/boards/sama5d3x-ek/configs/ov2640/defconfig
similarity index 100%
rename from boards/sama5d3x-ek/ov2640/defconfig
rename to boards/sama5d3x-ek/configs/ov2640/defconfig
diff --git a/boards/sama5d4-ek/at25boot/defconfig b/boards/sama5d4-ek/configs/at25boot/defconfig
similarity index 100%
rename from boards/sama5d4-ek/at25boot/defconfig
rename to boards/sama5d4-ek/configs/at25boot/defconfig
diff --git a/boards/sama5d4-ek/bridge/defconfig b/boards/sama5d4-ek/configs/bridge/defconfig
similarity index 100%
rename from boards/sama5d4-ek/bridge/defconfig
rename to boards/sama5d4-ek/configs/bridge/defconfig
diff --git a/boards/sama5d4-ek/dramboot/defconfig b/boards/sama5d4-ek/configs/dramboot/defconfig
similarity index 100%
rename from boards/sama5d4-ek/dramboot/defconfig
rename to boards/sama5d4-ek/configs/dramboot/defconfig
diff --git a/boards/sama5d4-ek/elf/defconfig b/boards/sama5d4-ek/configs/elf/defconfig
similarity index 100%
rename from boards/sama5d4-ek/elf/defconfig
rename to boards/sama5d4-ek/configs/elf/defconfig
diff --git a/boards/sama5d4-ek/ipv6/defconfig b/boards/sama5d4-ek/configs/ipv6/defconfig
similarity index 100%
rename from boards/sama5d4-ek/ipv6/defconfig
rename to boards/sama5d4-ek/configs/ipv6/defconfig
diff --git a/boards/sama5d4-ek/knsh/Make.defs b/boards/sama5d4-ek/configs/knsh/Make.defs
similarity index 100%
rename from boards/sama5d4-ek/knsh/Make.defs
rename to boards/sama5d4-ek/configs/knsh/Make.defs
diff --git a/boards/sama5d4-ek/knsh/defconfig b/boards/sama5d4-ek/configs/knsh/defconfig
similarity index 100%
rename from boards/sama5d4-ek/knsh/defconfig
rename to boards/sama5d4-ek/configs/knsh/defconfig
diff --git a/boards/sama5d4-ek/nsh/defconfig b/boards/sama5d4-ek/configs/nsh/defconfig
similarity index 100%
rename from boards/sama5d4-ek/nsh/defconfig
rename to boards/sama5d4-ek/configs/nsh/defconfig
diff --git a/boards/sama5d4-ek/nxwm/defconfig b/boards/sama5d4-ek/configs/nxwm/defconfig
similarity index 100%
rename from boards/sama5d4-ek/nxwm/defconfig
rename to boards/sama5d4-ek/configs/nxwm/defconfig
diff --git a/boards/sama5d4-ek/ramtest/defconfig b/boards/sama5d4-ek/configs/ramtest/defconfig
similarity index 100%
rename from boards/sama5d4-ek/ramtest/defconfig
rename to boards/sama5d4-ek/configs/ramtest/defconfig
diff --git a/boards/samd20-xplained/nsh/defconfig b/boards/samd20-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/samd20-xplained/nsh/defconfig
rename to boards/samd20-xplained/configs/nsh/defconfig
diff --git a/boards/samd21-xplained/nsh/defconfig b/boards/samd21-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/samd21-xplained/nsh/defconfig
rename to boards/samd21-xplained/configs/nsh/defconfig
diff --git a/boards/same70-xplained/mrf24j40-starhub/defconfig b/boards/same70-xplained/configs/mrf24j40-starhub/defconfig
similarity index 100%
rename from boards/same70-xplained/mrf24j40-starhub/defconfig
rename to boards/same70-xplained/configs/mrf24j40-starhub/defconfig
diff --git a/boards/same70-xplained/netnsh/defconfig b/boards/same70-xplained/configs/netnsh/defconfig
similarity index 100%
rename from boards/same70-xplained/netnsh/defconfig
rename to boards/same70-xplained/configs/netnsh/defconfig
diff --git a/boards/same70-xplained/nsh/defconfig b/boards/same70-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/same70-xplained/nsh/defconfig
rename to boards/same70-xplained/configs/nsh/defconfig
diff --git a/boards/same70-xplained/twm4nx/defconfig b/boards/same70-xplained/configs/twm4nx/defconfig
similarity index 100%
rename from boards/same70-xplained/twm4nx/defconfig
rename to boards/same70-xplained/configs/twm4nx/defconfig
diff --git a/boards/saml21-xplained/nsh/defconfig b/boards/saml21-xplained/configs/nsh/defconfig
similarity index 100%
rename from boards/saml21-xplained/nsh/defconfig
rename to boards/saml21-xplained/configs/nsh/defconfig
diff --git a/boards/samv71-xult/knsh/Make.defs b/boards/samv71-xult/configs/knsh/Make.defs
similarity index 100%
rename from boards/samv71-xult/knsh/Make.defs
rename to boards/samv71-xult/configs/knsh/Make.defs
diff --git a/boards/samv71-xult/knsh/defconfig b/boards/samv71-xult/configs/knsh/defconfig
similarity index 100%
rename from boards/samv71-xult/knsh/defconfig
rename to boards/samv71-xult/configs/knsh/defconfig
diff --git a/boards/samv71-xult/module/defconfig b/boards/samv71-xult/configs/module/defconfig
similarity index 100%
rename from boards/samv71-xult/module/defconfig
rename to boards/samv71-xult/configs/module/defconfig
diff --git a/boards/samv71-xult/mrf24j40-starhub/defconfig b/boards/samv71-xult/configs/mrf24j40-starhub/defconfig
similarity index 100%
rename from boards/samv71-xult/mrf24j40-starhub/defconfig
rename to boards/samv71-xult/configs/mrf24j40-starhub/defconfig
diff --git a/boards/samv71-xult/mxtxplnd/defconfig b/boards/samv71-xult/configs/mxtxplnd/defconfig
similarity index 100%
rename from boards/samv71-xult/mxtxplnd/defconfig
rename to boards/samv71-xult/configs/mxtxplnd/defconfig
diff --git a/boards/samv71-xult/netnsh/defconfig b/boards/samv71-xult/configs/netnsh/defconfig
similarity index 100%
rename from boards/samv71-xult/netnsh/defconfig
rename to boards/samv71-xult/configs/netnsh/defconfig
diff --git a/boards/samv71-xult/nsh/defconfig b/boards/samv71-xult/configs/nsh/defconfig
similarity index 100%
rename from boards/samv71-xult/nsh/defconfig
rename to boards/samv71-xult/configs/nsh/defconfig
diff --git a/boards/samv71-xult/nxwm/defconfig b/boards/samv71-xult/configs/nxwm/defconfig
similarity index 100%
rename from boards/samv71-xult/nxwm/defconfig
rename to boards/samv71-xult/configs/nxwm/defconfig
diff --git a/boards/samv71-xult/vnc/defconfig b/boards/samv71-xult/configs/vnc/defconfig
similarity index 100%
rename from boards/samv71-xult/vnc/defconfig
rename to boards/samv71-xult/configs/vnc/defconfig
diff --git a/boards/samv71-xult/vnxwm/defconfig b/boards/samv71-xult/configs/vnxwm/defconfig
similarity index 100%
rename from boards/samv71-xult/vnxwm/defconfig
rename to boards/samv71-xult/configs/vnxwm/defconfig
diff --git a/boards/shenzhou/nsh/defconfig b/boards/shenzhou/configs/nsh/defconfig
similarity index 100%
rename from boards/shenzhou/nsh/defconfig
rename to boards/shenzhou/configs/nsh/defconfig
diff --git a/boards/shenzhou/nxwm/defconfig b/boards/shenzhou/configs/nxwm/defconfig
similarity index 100%
rename from boards/shenzhou/nxwm/defconfig
rename to boards/shenzhou/configs/nxwm/defconfig
diff --git a/boards/shenzhou/thttpd/defconfig b/boards/shenzhou/configs/thttpd/defconfig
similarity index 100%
rename from boards/shenzhou/thttpd/defconfig
rename to boards/shenzhou/configs/thttpd/defconfig
diff --git a/boards/sim/bas/defconfig b/boards/sim/configs/bas/defconfig
similarity index 100%
rename from boards/sim/bas/defconfig
rename to boards/sim/configs/bas/defconfig
diff --git a/boards/sim/bluetooth/defconfig b/boards/sim/configs/bluetooth/defconfig
similarity index 100%
rename from boards/sim/bluetooth/defconfig
rename to boards/sim/configs/bluetooth/defconfig
diff --git a/boards/sim/configdata/defconfig b/boards/sim/configs/configdata/defconfig
similarity index 100%
rename from boards/sim/configdata/defconfig
rename to boards/sim/configs/configdata/defconfig
diff --git a/boards/sim/cxxtest/Make.defs b/boards/sim/configs/cxxtest/Make.defs
similarity index 100%
rename from boards/sim/cxxtest/Make.defs
rename to boards/sim/configs/cxxtest/Make.defs
diff --git a/boards/sim/cxxtest/defconfig b/boards/sim/configs/cxxtest/defconfig
similarity index 100%
rename from boards/sim/cxxtest/defconfig
rename to boards/sim/configs/cxxtest/defconfig
diff --git a/boards/sim/dsptest/defconfig b/boards/sim/configs/dsptest/defconfig
similarity index 100%
rename from boards/sim/dsptest/defconfig
rename to boards/sim/configs/dsptest/defconfig
diff --git a/boards/sim/fb/defconfig b/boards/sim/configs/fb/defconfig
similarity index 100%
rename from boards/sim/fb/defconfig
rename to boards/sim/configs/fb/defconfig
diff --git a/boards/sim/ipforward/defconfig b/boards/sim/configs/ipforward/defconfig
similarity index 100%
rename from boards/sim/ipforward/defconfig
rename to boards/sim/configs/ipforward/defconfig
diff --git a/boards/sim/loadable/defconfig b/boards/sim/configs/loadable/defconfig
similarity index 100%
rename from boards/sim/loadable/defconfig
rename to boards/sim/configs/loadable/defconfig
diff --git a/boards/sim/minibasic/defconfig b/boards/sim/configs/minibasic/defconfig
similarity index 100%
rename from boards/sim/minibasic/defconfig
rename to boards/sim/configs/minibasic/defconfig
diff --git a/boards/sim/mount/defconfig b/boards/sim/configs/mount/defconfig
similarity index 100%
rename from boards/sim/mount/defconfig
rename to boards/sim/configs/mount/defconfig
diff --git a/boards/sim/mtdpart/defconfig b/boards/sim/configs/mtdpart/defconfig
similarity index 100%
rename from boards/sim/mtdpart/defconfig
rename to boards/sim/configs/mtdpart/defconfig
diff --git a/boards/sim/mtdrwb/defconfig b/boards/sim/configs/mtdrwb/defconfig
similarity index 100%
rename from boards/sim/mtdrwb/defconfig
rename to boards/sim/configs/mtdrwb/defconfig
diff --git a/boards/sim/nettest/defconfig b/boards/sim/configs/nettest/defconfig
similarity index 100%
rename from boards/sim/nettest/defconfig
rename to boards/sim/configs/nettest/defconfig
diff --git a/boards/sim/nsh/defconfig b/boards/sim/configs/nsh/defconfig
similarity index 100%
rename from boards/sim/nsh/defconfig
rename to boards/sim/configs/nsh/defconfig
diff --git a/boards/sim/nsh2/Make.defs b/boards/sim/configs/nsh2/Make.defs
similarity index 100%
rename from boards/sim/nsh2/Make.defs
rename to boards/sim/configs/nsh2/Make.defs
diff --git a/boards/sim/nsh2/defconfig b/boards/sim/configs/nsh2/defconfig
similarity index 100%
rename from boards/sim/nsh2/defconfig
rename to boards/sim/configs/nsh2/defconfig
diff --git a/boards/sim/nx/defconfig b/boards/sim/configs/nx/defconfig
similarity index 100%
rename from boards/sim/nx/defconfig
rename to boards/sim/configs/nx/defconfig
diff --git a/boards/sim/nx11/defconfig b/boards/sim/configs/nx11/defconfig
similarity index 100%
rename from boards/sim/nx11/defconfig
rename to boards/sim/configs/nx11/defconfig
diff --git a/boards/sim/nxffs/defconfig b/boards/sim/configs/nxffs/defconfig
similarity index 100%
rename from boards/sim/nxffs/defconfig
rename to boards/sim/configs/nxffs/defconfig
diff --git a/boards/sim/nxlines/defconfig b/boards/sim/configs/nxlines/defconfig
similarity index 100%
rename from boards/sim/nxlines/defconfig
rename to boards/sim/configs/nxlines/defconfig
diff --git a/boards/sim/nxwm/defconfig b/boards/sim/configs/nxwm/defconfig
similarity index 100%
rename from boards/sim/nxwm/defconfig
rename to boards/sim/configs/nxwm/defconfig
diff --git a/boards/sim/ostest/defconfig b/boards/sim/configs/ostest/defconfig
similarity index 100%
rename from boards/sim/ostest/defconfig
rename to boards/sim/configs/ostest/defconfig
diff --git a/boards/sim/pashello/defconfig b/boards/sim/configs/pashello/defconfig
similarity index 100%
rename from boards/sim/pashello/defconfig
rename to boards/sim/configs/pashello/defconfig
diff --git a/boards/sim/pf_ieee802154/defconfig b/boards/sim/configs/pf_ieee802154/defconfig
similarity index 100%
rename from boards/sim/pf_ieee802154/defconfig
rename to boards/sim/configs/pf_ieee802154/defconfig
diff --git a/boards/sim/pktradio/defconfig b/boards/sim/configs/pktradio/defconfig
similarity index 100%
rename from boards/sim/pktradio/defconfig
rename to boards/sim/configs/pktradio/defconfig
diff --git a/boards/sim/sixlowpan/defconfig b/boards/sim/configs/sixlowpan/defconfig
similarity index 100%
rename from boards/sim/sixlowpan/defconfig
rename to boards/sim/configs/sixlowpan/defconfig
diff --git a/boards/sim/spiffs/defconfig b/boards/sim/configs/spiffs/defconfig
similarity index 100%
rename from boards/sim/spiffs/defconfig
rename to boards/sim/configs/spiffs/defconfig
diff --git a/boards/sim/touchscreen/defconfig b/boards/sim/configs/touchscreen/defconfig
similarity index 100%
rename from boards/sim/touchscreen/defconfig
rename to boards/sim/configs/touchscreen/defconfig
diff --git a/boards/sim/traveler/defconfig b/boards/sim/configs/traveler/defconfig
similarity index 100%
rename from boards/sim/traveler/defconfig
rename to boards/sim/configs/traveler/defconfig
diff --git a/boards/sim/udgram/defconfig b/boards/sim/configs/udgram/defconfig
similarity index 100%
rename from boards/sim/udgram/defconfig
rename to boards/sim/configs/udgram/defconfig
diff --git a/boards/sim/unionfs/defconfig b/boards/sim/configs/unionfs/defconfig
similarity index 100%
rename from boards/sim/unionfs/defconfig
rename to boards/sim/configs/unionfs/defconfig
diff --git a/boards/sim/userfs/defconfig b/boards/sim/configs/userfs/defconfig
similarity index 100%
rename from boards/sim/userfs/defconfig
rename to boards/sim/configs/userfs/defconfig
diff --git a/boards/sim/ustream/defconfig b/boards/sim/configs/ustream/defconfig
similarity index 100%
rename from boards/sim/ustream/defconfig
rename to boards/sim/configs/ustream/defconfig
diff --git a/boards/skp16c26/ostest/defconfig b/boards/skp16c26/configs/ostest/defconfig
similarity index 100%
rename from boards/skp16c26/ostest/defconfig
rename to boards/skp16c26/configs/ostest/defconfig
diff --git a/boards/spresense/lcd/defconfig b/boards/spresense/configs/lcd/defconfig
similarity index 100%
rename from boards/spresense/lcd/defconfig
rename to boards/spresense/configs/lcd/defconfig
diff --git a/boards/spresense/mpy/defconfig b/boards/spresense/configs/mpy/defconfig
similarity index 100%
rename from boards/spresense/mpy/defconfig
rename to boards/spresense/configs/mpy/defconfig
diff --git a/boards/spresense/nsh/defconfig b/boards/spresense/configs/nsh/defconfig
similarity index 100%
rename from boards/spresense/nsh/defconfig
rename to boards/spresense/configs/nsh/defconfig
diff --git a/boards/spresense/rndis/defconfig b/boards/spresense/configs/rndis/defconfig
similarity index 100%
rename from boards/spresense/rndis/defconfig
rename to boards/spresense/configs/rndis/defconfig
diff --git a/boards/spresense/usbmsc/defconfig b/boards/spresense/configs/usbmsc/defconfig
similarity index 100%
rename from boards/spresense/usbmsc/defconfig
rename to boards/spresense/configs/usbmsc/defconfig
diff --git a/boards/spresense/usbnsh/defconfig b/boards/spresense/configs/usbnsh/defconfig
similarity index 100%
rename from boards/spresense/usbnsh/defconfig
rename to boards/spresense/configs/usbnsh/defconfig
diff --git a/boards/spresense/wifi/defconfig b/boards/spresense/configs/wifi/defconfig
similarity index 100%
rename from boards/spresense/wifi/defconfig
rename to boards/spresense/configs/wifi/defconfig
diff --git a/boards/stm3210e-eval/composite/defconfig b/boards/stm3210e-eval/configs/composite/defconfig
similarity index 100%
rename from boards/stm3210e-eval/composite/defconfig
rename to boards/stm3210e-eval/configs/composite/defconfig
diff --git a/boards/stm3210e-eval/nsh/defconfig b/boards/stm3210e-eval/configs/nsh/defconfig
similarity index 100%
rename from boards/stm3210e-eval/nsh/defconfig
rename to boards/stm3210e-eval/configs/nsh/defconfig
diff --git a/boards/stm3210e-eval/nsh2/defconfig b/boards/stm3210e-eval/configs/nsh2/defconfig
similarity index 100%
rename from boards/stm3210e-eval/nsh2/defconfig
rename to boards/stm3210e-eval/configs/nsh2/defconfig
diff --git a/boards/stm3210e-eval/nx/defconfig b/boards/stm3210e-eval/configs/nx/defconfig
similarity index 100%
rename from boards/stm3210e-eval/nx/defconfig
rename to boards/stm3210e-eval/configs/nx/defconfig
diff --git a/boards/stm3210e-eval/nxterm/defconfig b/boards/stm3210e-eval/configs/nxterm/defconfig
similarity index 100%
rename from boards/stm3210e-eval/nxterm/defconfig
rename to boards/stm3210e-eval/configs/nxterm/defconfig
diff --git a/boards/stm3210e-eval/pm/defconfig b/boards/stm3210e-eval/configs/pm/defconfig
similarity index 100%
rename from boards/stm3210e-eval/pm/defconfig
rename to boards/stm3210e-eval/configs/pm/defconfig
diff --git a/boards/stm3210e-eval/usbmsc/defconfig b/boards/stm3210e-eval/configs/usbmsc/defconfig
similarity index 100%
rename from boards/stm3210e-eval/usbmsc/defconfig
rename to boards/stm3210e-eval/configs/usbmsc/defconfig
diff --git a/boards/stm3210e-eval/usbserial/defconfig b/boards/stm3210e-eval/configs/usbserial/defconfig
similarity index 100%
rename from boards/stm3210e-eval/usbserial/defconfig
rename to boards/stm3210e-eval/configs/usbserial/defconfig
diff --git a/boards/stm3220g-eval/dhcpd/defconfig b/boards/stm3220g-eval/configs/dhcpd/defconfig
similarity index 100%
rename from boards/stm3220g-eval/dhcpd/defconfig
rename to boards/stm3220g-eval/configs/dhcpd/defconfig
diff --git a/boards/stm3220g-eval/nettest/defconfig b/boards/stm3220g-eval/configs/nettest/defconfig
similarity index 100%
rename from boards/stm3220g-eval/nettest/defconfig
rename to boards/stm3220g-eval/configs/nettest/defconfig
diff --git a/boards/stm3220g-eval/nsh/defconfig b/boards/stm3220g-eval/configs/nsh/defconfig
similarity index 100%
rename from boards/stm3220g-eval/nsh/defconfig
rename to boards/stm3220g-eval/configs/nsh/defconfig
diff --git a/boards/stm3220g-eval/nsh2/defconfig b/boards/stm3220g-eval/configs/nsh2/defconfig
similarity index 100%
rename from boards/stm3220g-eval/nsh2/defconfig
rename to boards/stm3220g-eval/configs/nsh2/defconfig
diff --git a/boards/stm3220g-eval/nxwm/defconfig b/boards/stm3220g-eval/configs/nxwm/defconfig
similarity index 100%
rename from boards/stm3220g-eval/nxwm/defconfig
rename to boards/stm3220g-eval/configs/nxwm/defconfig
diff --git a/boards/stm3220g-eval/telnetd/defconfig b/boards/stm3220g-eval/configs/telnetd/defconfig
similarity index 100%
rename from boards/stm3220g-eval/telnetd/defconfig
rename to boards/stm3220g-eval/configs/telnetd/defconfig
diff --git a/boards/stm3240g-eval/dhcpd/defconfig b/boards/stm3240g-eval/configs/dhcpd/defconfig
similarity index 100%
rename from boards/stm3240g-eval/dhcpd/defconfig
rename to boards/stm3240g-eval/configs/dhcpd/defconfig
diff --git a/boards/stm3240g-eval/discover/defconfig b/boards/stm3240g-eval/configs/discover/defconfig
similarity index 100%
rename from boards/stm3240g-eval/discover/defconfig
rename to boards/stm3240g-eval/configs/discover/defconfig
diff --git a/boards/stm3240g-eval/fb/defconfig b/boards/stm3240g-eval/configs/fb/defconfig
similarity index 100%
rename from boards/stm3240g-eval/fb/defconfig
rename to boards/stm3240g-eval/configs/fb/defconfig
diff --git a/boards/stm3240g-eval/knxwm/Make.defs b/boards/stm3240g-eval/configs/knxwm/Make.defs
similarity index 100%
rename from boards/stm3240g-eval/knxwm/Make.defs
rename to boards/stm3240g-eval/configs/knxwm/Make.defs
diff --git a/boards/stm3240g-eval/knxwm/defconfig b/boards/stm3240g-eval/configs/knxwm/defconfig
similarity index 100%
rename from boards/stm3240g-eval/knxwm/defconfig
rename to boards/stm3240g-eval/configs/knxwm/defconfig
diff --git a/boards/stm3240g-eval/nettest/defconfig b/boards/stm3240g-eval/configs/nettest/defconfig
similarity index 100%
rename from boards/stm3240g-eval/nettest/defconfig
rename to boards/stm3240g-eval/configs/nettest/defconfig
diff --git a/boards/stm3240g-eval/nsh/defconfig b/boards/stm3240g-eval/configs/nsh/defconfig
similarity index 100%
rename from boards/stm3240g-eval/nsh/defconfig
rename to boards/stm3240g-eval/configs/nsh/defconfig
diff --git a/boards/stm3240g-eval/nsh2/defconfig b/boards/stm3240g-eval/configs/nsh2/defconfig
similarity index 100%
rename from boards/stm3240g-eval/nsh2/defconfig
rename to boards/stm3240g-eval/configs/nsh2/defconfig
diff --git a/boards/stm3240g-eval/nxterm/defconfig b/boards/stm3240g-eval/configs/nxterm/defconfig
similarity index 100%
rename from boards/stm3240g-eval/nxterm/defconfig
rename to boards/stm3240g-eval/configs/nxterm/defconfig
diff --git a/boards/stm3240g-eval/nxwm/defconfig b/boards/stm3240g-eval/configs/nxwm/defconfig
similarity index 100%
rename from boards/stm3240g-eval/nxwm/defconfig
rename to boards/stm3240g-eval/configs/nxwm/defconfig
diff --git a/boards/stm3240g-eval/telnetd/defconfig b/boards/stm3240g-eval/configs/telnetd/defconfig
similarity index 100%
rename from boards/stm3240g-eval/telnetd/defconfig
rename to boards/stm3240g-eval/configs/telnetd/defconfig
diff --git a/boards/stm3240g-eval/webserver/defconfig b/boards/stm3240g-eval/configs/webserver/defconfig
similarity index 100%
rename from boards/stm3240g-eval/webserver/defconfig
rename to boards/stm3240g-eval/configs/webserver/defconfig
diff --git a/boards/stm3240g-eval/xmlrpc/defconfig b/boards/stm3240g-eval/configs/xmlrpc/defconfig
similarity index 100%
rename from boards/stm3240g-eval/xmlrpc/defconfig
rename to boards/stm3240g-eval/configs/xmlrpc/defconfig
diff --git a/boards/stm32_tiny/nsh/defconfig b/boards/stm32_tiny/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32_tiny/nsh/defconfig
rename to boards/stm32_tiny/configs/nsh/defconfig
diff --git a/boards/stm32_tiny/usbnsh/defconfig b/boards/stm32_tiny/configs/usbnsh/defconfig
similarity index 100%
rename from boards/stm32_tiny/usbnsh/defconfig
rename to boards/stm32_tiny/configs/usbnsh/defconfig
diff --git a/boards/stm32butterfly2/nsh/defconfig b/boards/stm32butterfly2/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32butterfly2/nsh/defconfig
rename to boards/stm32butterfly2/configs/nsh/defconfig
diff --git a/boards/stm32butterfly2/nshnet/defconfig b/boards/stm32butterfly2/configs/nshnet/defconfig
similarity index 100%
rename from boards/stm32butterfly2/nshnet/defconfig
rename to boards/stm32butterfly2/configs/nshnet/defconfig
diff --git a/boards/stm32butterfly2/nshusbdev/defconfig b/boards/stm32butterfly2/configs/nshusbdev/defconfig
similarity index 100%
rename from boards/stm32butterfly2/nshusbdev/defconfig
rename to boards/stm32butterfly2/configs/nshusbdev/defconfig
diff --git a/boards/stm32butterfly2/nshusbhost/defconfig b/boards/stm32butterfly2/configs/nshusbhost/defconfig
similarity index 100%
rename from boards/stm32butterfly2/nshusbhost/defconfig
rename to boards/stm32butterfly2/configs/nshusbhost/defconfig
diff --git a/boards/stm32f051-discovery/nsh/defconfig b/boards/stm32f051-discovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f051-discovery/nsh/defconfig
rename to boards/stm32f051-discovery/configs/nsh/defconfig
diff --git a/boards/stm32f072-discovery/nsh/defconfig b/boards/stm32f072-discovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f072-discovery/nsh/defconfig
rename to boards/stm32f072-discovery/configs/nsh/defconfig
diff --git a/boards/stm32f103-minimum/apds9960/defconfig b/boards/stm32f103-minimum/configs/apds9960/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/apds9960/defconfig
rename to boards/stm32f103-minimum/configs/apds9960/defconfig
diff --git a/boards/stm32f103-minimum/audio_tone/defconfig b/boards/stm32f103-minimum/configs/audio_tone/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/audio_tone/defconfig
rename to boards/stm32f103-minimum/configs/audio_tone/defconfig
diff --git a/boards/stm32f103-minimum/buttons/defconfig b/boards/stm32f103-minimum/configs/buttons/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/buttons/defconfig
rename to boards/stm32f103-minimum/configs/buttons/defconfig
diff --git a/boards/stm32f103-minimum/hello/defconfig b/boards/stm32f103-minimum/configs/hello/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/hello/defconfig
rename to boards/stm32f103-minimum/configs/hello/defconfig
diff --git a/boards/stm32f103-minimum/jlx12864g/defconfig b/boards/stm32f103-minimum/configs/jlx12864g/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/jlx12864g/defconfig
rename to boards/stm32f103-minimum/configs/jlx12864g/defconfig
diff --git a/boards/stm32f103-minimum/mcp2515/defconfig b/boards/stm32f103-minimum/configs/mcp2515/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/mcp2515/defconfig
rename to boards/stm32f103-minimum/configs/mcp2515/defconfig
diff --git a/boards/stm32f103-minimum/nrf24/defconfig b/boards/stm32f103-minimum/configs/nrf24/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/nrf24/defconfig
rename to boards/stm32f103-minimum/configs/nrf24/defconfig
diff --git a/boards/stm32f103-minimum/nsh/defconfig b/boards/stm32f103-minimum/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/nsh/defconfig
rename to boards/stm32f103-minimum/configs/nsh/defconfig
diff --git a/boards/stm32f103-minimum/pwm/defconfig b/boards/stm32f103-minimum/configs/pwm/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/pwm/defconfig
rename to boards/stm32f103-minimum/configs/pwm/defconfig
diff --git a/boards/stm32f103-minimum/rfid-rc522/defconfig b/boards/stm32f103-minimum/configs/rfid-rc522/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/rfid-rc522/defconfig
rename to boards/stm32f103-minimum/configs/rfid-rc522/defconfig
diff --git a/boards/stm32f103-minimum/rgbled/defconfig b/boards/stm32f103-minimum/configs/rgbled/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/rgbled/defconfig
rename to boards/stm32f103-minimum/configs/rgbled/defconfig
diff --git a/boards/stm32f103-minimum/usbnsh/defconfig b/boards/stm32f103-minimum/configs/usbnsh/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/usbnsh/defconfig
rename to boards/stm32f103-minimum/configs/usbnsh/defconfig
diff --git a/boards/stm32f103-minimum/userled/defconfig b/boards/stm32f103-minimum/configs/userled/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/userled/defconfig
rename to boards/stm32f103-minimum/configs/userled/defconfig
diff --git a/boards/stm32f103-minimum/veml6070/defconfig b/boards/stm32f103-minimum/configs/veml6070/defconfig
similarity index 100%
rename from boards/stm32f103-minimum/veml6070/defconfig
rename to boards/stm32f103-minimum/configs/veml6070/defconfig
diff --git a/boards/stm32f334-disco/buckboost/defconfig b/boards/stm32f334-disco/configs/buckboost/defconfig
similarity index 100%
rename from boards/stm32f334-disco/buckboost/defconfig
rename to boards/stm32f334-disco/configs/buckboost/defconfig
diff --git a/boards/stm32f334-disco/nsh/defconfig b/boards/stm32f334-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f334-disco/nsh/defconfig
rename to boards/stm32f334-disco/configs/nsh/defconfig
diff --git a/boards/stm32f334-disco/powerled/defconfig b/boards/stm32f334-disco/configs/powerled/defconfig
similarity index 100%
rename from boards/stm32f334-disco/powerled/defconfig
rename to boards/stm32f334-disco/configs/powerled/defconfig
diff --git a/boards/stm32f3discovery/nsh/defconfig b/boards/stm32f3discovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f3discovery/nsh/defconfig
rename to boards/stm32f3discovery/configs/nsh/defconfig
diff --git a/boards/stm32f3discovery/usbnsh/defconfig b/boards/stm32f3discovery/configs/usbnsh/defconfig
similarity index 100%
rename from boards/stm32f3discovery/usbnsh/defconfig
rename to boards/stm32f3discovery/configs/usbnsh/defconfig
diff --git a/boards/stm32f411e-disco/nsh/defconfig b/boards/stm32f411e-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f411e-disco/nsh/defconfig
rename to boards/stm32f411e-disco/configs/nsh/defconfig
diff --git a/boards/stm32f429i-disco/adc/defconfig b/boards/stm32f429i-disco/configs/adc/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/adc/defconfig
rename to boards/stm32f429i-disco/configs/adc/defconfig
diff --git a/boards/stm32f429i-disco/extflash/defconfig b/boards/stm32f429i-disco/configs/extflash/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/extflash/defconfig
rename to boards/stm32f429i-disco/configs/extflash/defconfig
diff --git a/boards/stm32f429i-disco/fb/README.txt b/boards/stm32f429i-disco/configs/fb/README.txt
similarity index 100%
rename from boards/stm32f429i-disco/fb/README.txt
rename to boards/stm32f429i-disco/configs/fb/README.txt
diff --git a/boards/stm32f429i-disco/fb/defconfig b/boards/stm32f429i-disco/configs/fb/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/fb/defconfig
rename to boards/stm32f429i-disco/configs/fb/defconfig
diff --git a/boards/stm32f429i-disco/highpri/defconfig b/boards/stm32f429i-disco/configs/highpri/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/highpri/defconfig
rename to boards/stm32f429i-disco/configs/highpri/defconfig
diff --git a/boards/stm32f429i-disco/lcd/defconfig b/boards/stm32f429i-disco/configs/lcd/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/lcd/defconfig
rename to boards/stm32f429i-disco/configs/lcd/defconfig
diff --git a/boards/stm32f429i-disco/lvgl/defconfig b/boards/stm32f429i-disco/configs/lvgl/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/lvgl/defconfig
rename to boards/stm32f429i-disco/configs/lvgl/defconfig
diff --git a/boards/stm32f429i-disco/nsh/defconfig b/boards/stm32f429i-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/nsh/defconfig
rename to boards/stm32f429i-disco/configs/nsh/defconfig
diff --git a/boards/stm32f429i-disco/nxhello/defconfig b/boards/stm32f429i-disco/configs/nxhello/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/nxhello/defconfig
rename to boards/stm32f429i-disco/configs/nxhello/defconfig
diff --git a/boards/stm32f429i-disco/nxwm/defconfig b/boards/stm32f429i-disco/configs/nxwm/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/nxwm/defconfig
rename to boards/stm32f429i-disco/configs/nxwm/defconfig
diff --git a/boards/stm32f429i-disco/usbmsc/defconfig b/boards/stm32f429i-disco/configs/usbmsc/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/usbmsc/defconfig
rename to boards/stm32f429i-disco/configs/usbmsc/defconfig
diff --git a/boards/stm32f429i-disco/usbnsh/defconfig b/boards/stm32f429i-disco/configs/usbnsh/defconfig
similarity index 100%
rename from boards/stm32f429i-disco/usbnsh/defconfig
rename to boards/stm32f429i-disco/configs/usbnsh/defconfig
diff --git a/boards/stm32f4discovery/audio/defconfig b/boards/stm32f4discovery/configs/audio/defconfig
similarity index 100%
rename from boards/stm32f4discovery/audio/defconfig
rename to boards/stm32f4discovery/configs/audio/defconfig
diff --git a/boards/stm32f4discovery/canard/defconfig b/boards/stm32f4discovery/configs/canard/defconfig
similarity index 100%
rename from boards/stm32f4discovery/canard/defconfig
rename to boards/stm32f4discovery/configs/canard/defconfig
diff --git a/boards/stm32f4discovery/cxxtest/Make.defs b/boards/stm32f4discovery/configs/cxxtest/Make.defs
similarity index 100%
rename from boards/stm32f4discovery/cxxtest/Make.defs
rename to boards/stm32f4discovery/configs/cxxtest/Make.defs
diff --git a/boards/stm32f4discovery/cxxtest/defconfig b/boards/stm32f4discovery/configs/cxxtest/defconfig
similarity index 100%
rename from boards/stm32f4discovery/cxxtest/defconfig
rename to boards/stm32f4discovery/configs/cxxtest/defconfig
diff --git a/boards/stm32f4discovery/elf/Make.defs b/boards/stm32f4discovery/configs/elf/Make.defs
similarity index 100%
rename from boards/stm32f4discovery/elf/Make.defs
rename to boards/stm32f4discovery/configs/elf/Make.defs
diff --git a/boards/stm32f4discovery/elf/defconfig b/boards/stm32f4discovery/configs/elf/defconfig
similarity index 100%
rename from boards/stm32f4discovery/elf/defconfig
rename to boards/stm32f4discovery/configs/elf/defconfig
diff --git a/boards/stm32f4discovery/hciuart/defconfig b/boards/stm32f4discovery/configs/hciuart/defconfig
similarity index 100%
rename from boards/stm32f4discovery/hciuart/defconfig
rename to boards/stm32f4discovery/configs/hciuart/defconfig
diff --git a/boards/stm32f4discovery/ipv6/defconfig b/boards/stm32f4discovery/configs/ipv6/defconfig
similarity index 100%
rename from boards/stm32f4discovery/ipv6/defconfig
rename to boards/stm32f4discovery/configs/ipv6/defconfig
diff --git a/boards/stm32f4discovery/kostest/defconfig b/boards/stm32f4discovery/configs/kostest/defconfig
similarity index 100%
rename from boards/stm32f4discovery/kostest/defconfig
rename to boards/stm32f4discovery/configs/kostest/defconfig
diff --git a/boards/stm32f4discovery/max31855/defconfig b/boards/stm32f4discovery/configs/max31855/defconfig
similarity index 100%
rename from boards/stm32f4discovery/max31855/defconfig
rename to boards/stm32f4discovery/configs/max31855/defconfig
diff --git a/boards/stm32f4discovery/max7219/defconfig b/boards/stm32f4discovery/configs/max7219/defconfig
similarity index 100%
rename from boards/stm32f4discovery/max7219/defconfig
rename to boards/stm32f4discovery/configs/max7219/defconfig
diff --git a/boards/stm32f4discovery/module/defconfig b/boards/stm32f4discovery/configs/module/defconfig
similarity index 100%
rename from boards/stm32f4discovery/module/defconfig
rename to boards/stm32f4discovery/configs/module/defconfig
diff --git a/boards/stm32f4discovery/netnsh/defconfig b/boards/stm32f4discovery/configs/netnsh/defconfig
similarity index 100%
rename from boards/stm32f4discovery/netnsh/defconfig
rename to boards/stm32f4discovery/configs/netnsh/defconfig
diff --git a/boards/stm32f4discovery/nsh/defconfig b/boards/stm32f4discovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f4discovery/nsh/defconfig
rename to boards/stm32f4discovery/configs/nsh/defconfig
diff --git a/boards/stm32f4discovery/nxlines/defconfig b/boards/stm32f4discovery/configs/nxlines/defconfig
similarity index 100%
rename from boards/stm32f4discovery/nxlines/defconfig
rename to boards/stm32f4discovery/configs/nxlines/defconfig
diff --git a/boards/stm32f4discovery/pm/defconfig b/boards/stm32f4discovery/configs/pm/defconfig
similarity index 100%
rename from boards/stm32f4discovery/pm/defconfig
rename to boards/stm32f4discovery/configs/pm/defconfig
diff --git a/boards/stm32f4discovery/posix_spawn/Make.defs b/boards/stm32f4discovery/configs/posix_spawn/Make.defs
similarity index 100%
rename from boards/stm32f4discovery/posix_spawn/Make.defs
rename to boards/stm32f4discovery/configs/posix_spawn/Make.defs
diff --git a/boards/stm32f4discovery/posix_spawn/defconfig b/boards/stm32f4discovery/configs/posix_spawn/defconfig
similarity index 100%
rename from boards/stm32f4discovery/posix_spawn/defconfig
rename to boards/stm32f4discovery/configs/posix_spawn/defconfig
diff --git a/boards/stm32f4discovery/pseudoterm/defconfig b/boards/stm32f4discovery/configs/pseudoterm/defconfig
similarity index 100%
rename from boards/stm32f4discovery/pseudoterm/defconfig
rename to boards/stm32f4discovery/configs/pseudoterm/defconfig
diff --git a/boards/stm32f4discovery/rgbled/defconfig b/boards/stm32f4discovery/configs/rgbled/defconfig
similarity index 100%
rename from boards/stm32f4discovery/rgbled/defconfig
rename to boards/stm32f4discovery/configs/rgbled/defconfig
diff --git a/boards/stm32f4discovery/rndis/defconfig b/boards/stm32f4discovery/configs/rndis/defconfig
similarity index 100%
rename from boards/stm32f4discovery/rndis/defconfig
rename to boards/stm32f4discovery/configs/rndis/defconfig
diff --git a/boards/stm32f4discovery/testlibcxx/Make.defs b/boards/stm32f4discovery/configs/testlibcxx/Make.defs
similarity index 100%
rename from boards/stm32f4discovery/testlibcxx/Make.defs
rename to boards/stm32f4discovery/configs/testlibcxx/Make.defs
diff --git a/boards/stm32f4discovery/testlibcxx/defconfig b/boards/stm32f4discovery/configs/testlibcxx/defconfig
similarity index 100%
rename from boards/stm32f4discovery/testlibcxx/defconfig
rename to boards/stm32f4discovery/configs/testlibcxx/defconfig
diff --git a/boards/stm32f4discovery/usbmsc/defconfig b/boards/stm32f4discovery/configs/usbmsc/defconfig
similarity index 100%
rename from boards/stm32f4discovery/usbmsc/defconfig
rename to boards/stm32f4discovery/configs/usbmsc/defconfig
diff --git a/boards/stm32f4discovery/usbnsh/defconfig b/boards/stm32f4discovery/configs/usbnsh/defconfig
similarity index 100%
rename from boards/stm32f4discovery/usbnsh/defconfig
rename to boards/stm32f4discovery/configs/usbnsh/defconfig
diff --git a/boards/stm32f4discovery/winbuild/Make.defs b/boards/stm32f4discovery/configs/winbuild/Make.defs
similarity index 100%
rename from boards/stm32f4discovery/winbuild/Make.defs
rename to boards/stm32f4discovery/configs/winbuild/Make.defs
diff --git a/boards/stm32f4discovery/winbuild/defconfig b/boards/stm32f4discovery/configs/winbuild/defconfig
similarity index 100%
rename from boards/stm32f4discovery/winbuild/defconfig
rename to boards/stm32f4discovery/configs/winbuild/defconfig
diff --git a/boards/stm32f4discovery/xen1210/defconfig b/boards/stm32f4discovery/configs/xen1210/defconfig
similarity index 100%
rename from boards/stm32f4discovery/xen1210/defconfig
rename to boards/stm32f4discovery/configs/xen1210/defconfig
diff --git a/boards/stm32f746-ws/nsh/defconfig b/boards/stm32f746-ws/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f746-ws/nsh/defconfig
rename to boards/stm32f746-ws/configs/nsh/defconfig
diff --git a/boards/stm32f746g-disco/fb/README.txt b/boards/stm32f746g-disco/configs/fb/README.txt
similarity index 100%
rename from boards/stm32f746g-disco/fb/README.txt
rename to boards/stm32f746g-disco/configs/fb/README.txt
diff --git a/boards/stm32f746g-disco/fb/defconfig b/boards/stm32f746g-disco/configs/fb/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/fb/defconfig
rename to boards/stm32f746g-disco/configs/fb/defconfig
diff --git a/boards/stm32f746g-disco/lvgl/defconfig b/boards/stm32f746g-disco/configs/lvgl/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/lvgl/defconfig
rename to boards/stm32f746g-disco/configs/lvgl/defconfig
diff --git a/boards/stm32f746g-disco/netnsh/defconfig b/boards/stm32f746g-disco/configs/netnsh/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/netnsh/defconfig
rename to boards/stm32f746g-disco/configs/netnsh/defconfig
diff --git a/boards/stm32f746g-disco/nsh/defconfig b/boards/stm32f746g-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/nsh/defconfig
rename to boards/stm32f746g-disco/configs/nsh/defconfig
diff --git a/boards/stm32f746g-disco/nxdemo/README.txt b/boards/stm32f746g-disco/configs/nxdemo/README.txt
similarity index 100%
rename from boards/stm32f746g-disco/nxdemo/README.txt
rename to boards/stm32f746g-disco/configs/nxdemo/README.txt
diff --git a/boards/stm32f746g-disco/nxdemo/defconfig b/boards/stm32f746g-disco/configs/nxdemo/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/nxdemo/defconfig
rename to boards/stm32f746g-disco/configs/nxdemo/defconfig
diff --git a/boards/stm32f746g-disco/nxterm/README.txt b/boards/stm32f746g-disco/configs/nxterm/README.txt
similarity index 100%
rename from boards/stm32f746g-disco/nxterm/README.txt
rename to boards/stm32f746g-disco/configs/nxterm/README.txt
diff --git a/boards/stm32f746g-disco/nxterm/defconfig b/boards/stm32f746g-disco/configs/nxterm/defconfig
similarity index 100%
rename from boards/stm32f746g-disco/nxterm/defconfig
rename to boards/stm32f746g-disco/configs/nxterm/defconfig
diff --git a/boards/stm32f769i-disco/netnsh/defconfig b/boards/stm32f769i-disco/configs/netnsh/defconfig
similarity index 100%
rename from boards/stm32f769i-disco/netnsh/defconfig
rename to boards/stm32f769i-disco/configs/netnsh/defconfig
diff --git a/boards/stm32f769i-disco/nsh/defconfig b/boards/stm32f769i-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32f769i-disco/nsh/defconfig
rename to boards/stm32f769i-disco/configs/nsh/defconfig
diff --git a/boards/stm32l476-mdk/nsh/defconfig b/boards/stm32l476-mdk/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32l476-mdk/nsh/defconfig
rename to boards/stm32l476-mdk/configs/nsh/defconfig
diff --git a/boards/stm32l476vg-disco/knsh/Make.defs b/boards/stm32l476vg-disco/configs/knsh/Make.defs
similarity index 100%
rename from boards/stm32l476vg-disco/knsh/Make.defs
rename to boards/stm32l476vg-disco/configs/knsh/Make.defs
diff --git a/boards/stm32l476vg-disco/knsh/defconfig b/boards/stm32l476vg-disco/configs/knsh/defconfig
similarity index 100%
rename from boards/stm32l476vg-disco/knsh/defconfig
rename to boards/stm32l476vg-disco/configs/knsh/defconfig
diff --git a/boards/stm32l476vg-disco/nsh/defconfig b/boards/stm32l476vg-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32l476vg-disco/nsh/defconfig
rename to boards/stm32l476vg-disco/configs/nsh/defconfig
diff --git a/boards/stm32l4r9ai-disco/knsh/Make.defs b/boards/stm32l4r9ai-disco/configs/knsh/Make.defs
similarity index 100%
rename from boards/stm32l4r9ai-disco/knsh/Make.defs
rename to boards/stm32l4r9ai-disco/configs/knsh/Make.defs
diff --git a/boards/stm32l4r9ai-disco/knsh/defconfig b/boards/stm32l4r9ai-disco/configs/knsh/defconfig
similarity index 100%
rename from boards/stm32l4r9ai-disco/knsh/defconfig
rename to boards/stm32l4r9ai-disco/configs/knsh/defconfig
diff --git a/boards/stm32l4r9ai-disco/nsh/defconfig b/boards/stm32l4r9ai-disco/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32l4r9ai-disco/nsh/defconfig
rename to boards/stm32l4r9ai-disco/configs/nsh/defconfig
diff --git a/boards/stm32ldiscovery/chrono/defconfig b/boards/stm32ldiscovery/configs/chrono/defconfig
similarity index 100%
rename from boards/stm32ldiscovery/chrono/defconfig
rename to boards/stm32ldiscovery/configs/chrono/defconfig
diff --git a/boards/stm32ldiscovery/nsh/defconfig b/boards/stm32ldiscovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32ldiscovery/nsh/defconfig
rename to boards/stm32ldiscovery/configs/nsh/defconfig
diff --git a/boards/stm32vldiscovery/nsh/defconfig b/boards/stm32vldiscovery/configs/nsh/defconfig
similarity index 100%
rename from boards/stm32vldiscovery/nsh/defconfig
rename to boards/stm32vldiscovery/configs/nsh/defconfig
diff --git a/boards/sure-pic32mx/nsh/defconfig b/boards/sure-pic32mx/configs/nsh/defconfig
similarity index 100%
rename from boards/sure-pic32mx/nsh/defconfig
rename to boards/sure-pic32mx/configs/nsh/defconfig
diff --git a/boards/sure-pic32mx/usbnsh/defconfig b/boards/sure-pic32mx/configs/usbnsh/defconfig
similarity index 100%
rename from boards/sure-pic32mx/usbnsh/defconfig
rename to boards/sure-pic32mx/configs/usbnsh/defconfig
diff --git a/boards/teensy-2.0/hello/defconfig b/boards/teensy-2.0/configs/hello/defconfig
similarity index 100%
rename from boards/teensy-2.0/hello/defconfig
rename to boards/teensy-2.0/configs/hello/defconfig
diff --git a/boards/teensy-2.0/nsh/defconfig b/boards/teensy-2.0/configs/nsh/defconfig
similarity index 100%
rename from boards/teensy-2.0/nsh/defconfig
rename to boards/teensy-2.0/configs/nsh/defconfig
diff --git a/boards/teensy-2.0/usbmsc/defconfig b/boards/teensy-2.0/configs/usbmsc/defconfig
similarity index 100%
rename from boards/teensy-2.0/usbmsc/defconfig
rename to boards/teensy-2.0/configs/usbmsc/defconfig
diff --git a/boards/teensy-3.x/nsh/defconfig b/boards/teensy-3.x/configs/nsh/defconfig
similarity index 100%
rename from boards/teensy-3.x/nsh/defconfig
rename to boards/teensy-3.x/configs/nsh/defconfig
diff --git a/boards/teensy-3.x/usbnsh/defconfig b/boards/teensy-3.x/configs/usbnsh/defconfig
similarity index 100%
rename from boards/teensy-3.x/usbnsh/defconfig
rename to boards/teensy-3.x/configs/usbnsh/defconfig
diff --git a/boards/teensy-lc/nsh/defconfig b/boards/teensy-lc/configs/nsh/defconfig
similarity index 100%
rename from boards/teensy-lc/nsh/defconfig
rename to boards/teensy-lc/configs/nsh/defconfig
diff --git a/boards/tm4c123g-launchpad/nsh/defconfig b/boards/tm4c123g-launchpad/configs/nsh/defconfig
similarity index 100%
rename from boards/tm4c123g-launchpad/nsh/defconfig
rename to boards/tm4c123g-launchpad/configs/nsh/defconfig
diff --git a/boards/tm4c1294-launchpad/ipv6/defconfig b/boards/tm4c1294-launchpad/configs/ipv6/defconfig
similarity index 100%
rename from boards/tm4c1294-launchpad/ipv6/defconfig
rename to boards/tm4c1294-launchpad/configs/ipv6/defconfig
diff --git a/boards/tm4c1294-launchpad/nsh/defconfig b/boards/tm4c1294-launchpad/configs/nsh/defconfig
similarity index 100%
rename from boards/tm4c1294-launchpad/nsh/defconfig
rename to boards/tm4c1294-launchpad/configs/nsh/defconfig
diff --git a/boards/tms570ls31x-usb-kit/nsh/defconfig b/boards/tms570ls31x-usb-kit/configs/nsh/defconfig
similarity index 100%
rename from boards/tms570ls31x-usb-kit/nsh/defconfig
rename to boards/tms570ls31x-usb-kit/configs/nsh/defconfig
diff --git a/boards/twr-k60n512/nsh/defconfig b/boards/twr-k60n512/configs/nsh/defconfig
similarity index 100%
rename from boards/twr-k60n512/nsh/defconfig
rename to boards/twr-k60n512/configs/nsh/defconfig
diff --git a/boards/twr-k64f120m/netnsh/defconfig b/boards/twr-k64f120m/configs/netnsh/defconfig
similarity index 100%
rename from boards/twr-k64f120m/netnsh/defconfig
rename to boards/twr-k64f120m/configs/netnsh/defconfig
diff --git a/boards/twr-k64f120m/nsh/defconfig b/boards/twr-k64f120m/configs/nsh/defconfig
similarity index 100%
rename from boards/twr-k64f120m/nsh/defconfig
rename to boards/twr-k64f120m/configs/nsh/defconfig
diff --git a/boards/u-blox-c027/nsh/defconfig b/boards/u-blox-c027/configs/nsh/defconfig
similarity index 100%
rename from boards/u-blox-c027/nsh/defconfig
rename to boards/u-blox-c027/configs/nsh/defconfig
diff --git a/boards/ubw32/nsh/defconfig b/boards/ubw32/configs/nsh/defconfig
similarity index 100%
rename from boards/ubw32/nsh/defconfig
rename to boards/ubw32/configs/nsh/defconfig
diff --git a/boards/us7032evb1/nsh/defconfig b/boards/us7032evb1/configs/nsh/defconfig
similarity index 100%
rename from boards/us7032evb1/nsh/defconfig
rename to boards/us7032evb1/configs/nsh/defconfig
diff --git a/boards/us7032evb1/ostest/defconfig b/boards/us7032evb1/configs/ostest/defconfig
similarity index 100%
rename from boards/us7032evb1/ostest/defconfig
rename to boards/us7032evb1/configs/ostest/defconfig
diff --git a/boards/us7032evb1/ostest/ld.script b/boards/us7032evb1/configs/ostest/ld.script
similarity index 100%
rename from boards/us7032evb1/ostest/ld.script
rename to boards/us7032evb1/configs/ostest/ld.script
diff --git a/boards/viewtool-stm32f107/ft80x/defconfig b/boards/viewtool-stm32f107/configs/ft80x/defconfig
similarity index 100%
rename from boards/viewtool-stm32f107/ft80x/defconfig
rename to boards/viewtool-stm32f107/configs/ft80x/defconfig
diff --git a/boards/viewtool-stm32f107/highpri/defconfig b/boards/viewtool-stm32f107/configs/highpri/defconfig
similarity index 100%
rename from boards/viewtool-stm32f107/highpri/defconfig
rename to boards/viewtool-stm32f107/configs/highpri/defconfig
diff --git a/boards/viewtool-stm32f107/netnsh/defconfig b/boards/viewtool-stm32f107/configs/netnsh/defconfig
similarity index 100%
rename from boards/viewtool-stm32f107/netnsh/defconfig
rename to boards/viewtool-stm32f107/configs/netnsh/defconfig
diff --git a/boards/viewtool-stm32f107/nsh/defconfig b/boards/viewtool-stm32f107/configs/nsh/defconfig
similarity index 100%
rename from boards/viewtool-stm32f107/nsh/defconfig
rename to boards/viewtool-stm32f107/configs/nsh/defconfig
diff --git a/boards/viewtool-stm32f107/tcpblaster/defconfig b/boards/viewtool-stm32f107/configs/tcpblaster/defconfig
similarity index 100%
rename from boards/viewtool-stm32f107/tcpblaster/defconfig
rename to boards/viewtool-stm32f107/configs/tcpblaster/defconfig
diff --git a/boards/xmc4500-relax/nsh/defconfig b/boards/xmc4500-relax/configs/nsh/defconfig
similarity index 100%
rename from boards/xmc4500-relax/nsh/defconfig
rename to boards/xmc4500-relax/configs/nsh/defconfig
diff --git a/boards/z16f2800100zcog/nsh/.gitignore b/boards/z16f2800100zcog/configs/nsh/.gitignore
similarity index 100%
rename from boards/z16f2800100zcog/nsh/.gitignore
rename to boards/z16f2800100zcog/configs/nsh/.gitignore
diff --git a/boards/z16f2800100zcog/nsh/README.txt b/boards/z16f2800100zcog/configs/nsh/README.txt
similarity index 100%
rename from boards/z16f2800100zcog/nsh/README.txt
rename to boards/z16f2800100zcog/configs/nsh/README.txt
diff --git a/boards/z16f2800100zcog/nsh/defconfig b/boards/z16f2800100zcog/configs/nsh/defconfig
similarity index 100%
rename from boards/z16f2800100zcog/nsh/defconfig
rename to boards/z16f2800100zcog/configs/nsh/defconfig
diff --git a/boards/z16f2800100zcog/nsh/nsh.zfpproj b/boards/z16f2800100zcog/configs/nsh/nsh.zfpproj
similarity index 100%
rename from boards/z16f2800100zcog/nsh/nsh.zfpproj
rename to boards/z16f2800100zcog/configs/nsh/nsh.zfpproj
diff --git a/boards/z16f2800100zcog/ostest/.gitignore b/boards/z16f2800100zcog/configs/ostest/.gitignore
similarity index 100%
rename from boards/z16f2800100zcog/ostest/.gitignore
rename to boards/z16f2800100zcog/configs/ostest/.gitignore
diff --git a/boards/z16f2800100zcog/ostest/README.txt b/boards/z16f2800100zcog/configs/ostest/README.txt
similarity index 100%
rename from boards/z16f2800100zcog/ostest/README.txt
rename to boards/z16f2800100zcog/configs/ostest/README.txt
diff --git a/boards/z16f2800100zcog/ostest/defconfig b/boards/z16f2800100zcog/configs/ostest/defconfig
similarity index 100%
rename from boards/z16f2800100zcog/ostest/defconfig
rename to boards/z16f2800100zcog/configs/ostest/defconfig
diff --git a/boards/z16f2800100zcog/ostest/ostest.zfpproj b/boards/z16f2800100zcog/configs/ostest/ostest.zfpproj
similarity index 100%
rename from boards/z16f2800100zcog/ostest/ostest.zfpproj
rename to boards/z16f2800100zcog/configs/ostest/ostest.zfpproj
diff --git a/boards/z16f2800100zcog/pashello/.gitignore b/boards/z16f2800100zcog/configs/pashello/.gitignore
similarity index 100%
rename from boards/z16f2800100zcog/pashello/.gitignore
rename to boards/z16f2800100zcog/configs/pashello/.gitignore
diff --git a/boards/z16f2800100zcog/pashello/README.txt b/boards/z16f2800100zcog/configs/pashello/README.txt
similarity index 100%
rename from boards/z16f2800100zcog/pashello/README.txt
rename to boards/z16f2800100zcog/configs/pashello/README.txt
diff --git a/boards/z16f2800100zcog/pashello/defconfig b/boards/z16f2800100zcog/configs/pashello/defconfig
similarity index 100%
rename from boards/z16f2800100zcog/pashello/defconfig
rename to boards/z16f2800100zcog/configs/pashello/defconfig
diff --git a/boards/z16f2800100zcog/pashello/pashello.zfpproj b/boards/z16f2800100zcog/configs/pashello/pashello.zfpproj
similarity index 100%
rename from boards/z16f2800100zcog/pashello/pashello.zfpproj
rename to boards/z16f2800100zcog/configs/pashello/pashello.zfpproj
diff --git a/boards/z80sim/nsh/defconfig b/boards/z80sim/configs/nsh/defconfig
similarity index 100%
rename from boards/z80sim/nsh/defconfig
rename to boards/z80sim/configs/nsh/defconfig
diff --git a/boards/z80sim/ostest/defconfig b/boards/z80sim/configs/ostest/defconfig
similarity index 100%
rename from boards/z80sim/ostest/defconfig
rename to boards/z80sim/configs/ostest/defconfig
diff --git a/boards/z80sim/pashello/defconfig b/boards/z80sim/configs/pashello/defconfig
similarity index 100%
rename from boards/z80sim/pashello/defconfig
rename to boards/z80sim/configs/pashello/defconfig
diff --git a/boards/z8encore000zco/ostest/.gitignore b/boards/z8encore000zco/configs/ostest/.gitignore
similarity index 100%
rename from boards/z8encore000zco/ostest/.gitignore
rename to boards/z8encore000zco/configs/ostest/.gitignore
diff --git a/boards/z8encore000zco/ostest/Make.defs b/boards/z8encore000zco/configs/ostest/Make.defs
similarity index 100%
rename from boards/z8encore000zco/ostest/Make.defs
rename to boards/z8encore000zco/configs/ostest/Make.defs
diff --git a/boards/z8encore000zco/ostest/README.txt b/boards/z8encore000zco/configs/ostest/README.txt
similarity index 100%
rename from boards/z8encore000zco/ostest/README.txt
rename to boards/z8encore000zco/configs/ostest/README.txt
diff --git a/boards/z8encore000zco/ostest/defconfig b/boards/z8encore000zco/configs/ostest/defconfig
similarity index 100%
rename from boards/z8encore000zco/ostest/defconfig
rename to boards/z8encore000zco/configs/ostest/defconfig
diff --git a/boards/z8encore000zco/ostest/ostest.linkcmd b/boards/z8encore000zco/configs/ostest/ostest.linkcmd
similarity index 100%
rename from boards/z8encore000zco/ostest/ostest.linkcmd
rename to boards/z8encore000zco/configs/ostest/ostest.linkcmd
diff --git a/boards/z8encore000zco/ostest/ostest.zdsproj b/boards/z8encore000zco/configs/ostest/ostest.zdsproj
similarity index 100%
rename from boards/z8encore000zco/ostest/ostest.zdsproj
rename to boards/z8encore000zco/configs/ostest/ostest.zdsproj
diff --git a/boards/z8f64200100kit/ostest/.gitignore b/boards/z8f64200100kit/configs/ostest/.gitignore
similarity index 100%
rename from boards/z8f64200100kit/ostest/.gitignore
rename to boards/z8f64200100kit/configs/ostest/.gitignore
diff --git a/boards/z8f64200100kit/ostest/Make.defs b/boards/z8f64200100kit/configs/ostest/Make.defs
similarity index 100%
rename from boards/z8f64200100kit/ostest/Make.defs
rename to boards/z8f64200100kit/configs/ostest/Make.defs
diff --git a/boards/z8f64200100kit/ostest/README.txt b/boards/z8f64200100kit/configs/ostest/README.txt
similarity index 100%
rename from boards/z8f64200100kit/ostest/README.txt
rename to boards/z8f64200100kit/configs/ostest/README.txt
diff --git a/boards/z8f64200100kit/ostest/defconfig b/boards/z8f64200100kit/configs/ostest/defconfig
similarity index 100%
rename from boards/z8f64200100kit/ostest/defconfig
rename to boards/z8f64200100kit/configs/ostest/defconfig
diff --git a/boards/z8f64200100kit/ostest/ostest.linkcmd b/boards/z8f64200100kit/configs/ostest/ostest.linkcmd
similarity index 100%
rename from boards/z8f64200100kit/ostest/ostest.linkcmd
rename to boards/z8f64200100kit/configs/ostest/ostest.linkcmd
diff --git a/boards/z8f64200100kit/ostest/ostest.zdsproj b/boards/z8f64200100kit/configs/ostest/ostest.zdsproj
similarity index 100%
rename from boards/z8f64200100kit/ostest/ostest.zdsproj
rename to boards/z8f64200100kit/configs/ostest/ostest.zdsproj
diff --git a/boards/zkit-arm-1769/hello/defconfig b/boards/zkit-arm-1769/configs/hello/defconfig
similarity index 100%
rename from boards/zkit-arm-1769/hello/defconfig
rename to boards/zkit-arm-1769/configs/hello/defconfig
diff --git a/boards/zkit-arm-1769/nsh/defconfig b/boards/zkit-arm-1769/configs/nsh/defconfig
similarity index 100%
rename from boards/zkit-arm-1769/nsh/defconfig
rename to boards/zkit-arm-1769/configs/nsh/defconfig
diff --git a/boards/zkit-arm-1769/nxhello/defconfig b/boards/zkit-arm-1769/configs/nxhello/defconfig
similarity index 100%
rename from boards/zkit-arm-1769/nxhello/defconfig
rename to boards/zkit-arm-1769/configs/nxhello/defconfig
diff --git a/boards/zkit-arm-1769/thttpd/defconfig b/boards/zkit-arm-1769/configs/thttpd/defconfig
similarity index 100%
rename from boards/zkit-arm-1769/thttpd/defconfig
rename to boards/zkit-arm-1769/configs/thttpd/defconfig
diff --git a/boards/zp214xpa/nsh/defconfig b/boards/zp214xpa/configs/nsh/defconfig
similarity index 100%
rename from boards/zp214xpa/nsh/defconfig
rename to boards/zp214xpa/configs/nsh/defconfig
diff --git a/boards/zp214xpa/nxlines/defconfig b/boards/zp214xpa/configs/nxlines/defconfig
similarity index 100%
rename from boards/zp214xpa/nxlines/defconfig
rename to boards/zp214xpa/configs/nxlines/defconfig
diff --git a/tools/configure.bat b/tools/configure.bat
index fbbfbf1bb7..23096bafb9 100755
--- a/tools/configure.bat
+++ b/tools/configure.bat
@@ -99,10 +99,10 @@ if errorlevel 1 echo configure.exe failed
 goto End
 
 :NoConfig
-echo Missing ^<board-name^>/^<config-name^> argument
+echo Missing ^<board-name^>\configs\^<config-name^> argument
 
 :ShowUsage
-echo USAGE: %0 [-d] [-b|f] [-a ^<app-dir^>] ^<board-name^>\^<config-name^>
+echo USAGE: %0 [-d] [-b|f] [-a ^<app-dir^>] ^<board-name^>\configs\^<config-name^>
 echo        %0 [-h]
 echo\nWhere:
 echo  -d:
@@ -131,7 +131,7 @@ echo    under nuttx/boards/.
 echo  ^<config-name^>:
 echo    Identifies the specific configuratin for the selected ^<board-name^>.
 echo    This must correspond to a sub-directory under the board directory at
-echo    under nuttx/boards/^<board-name^>/.
+echo    under nuttx/boards/^<board-name^>/configs/.
 echo  -h:
 echo    Prints this message and exits.
 
diff --git a/tools/configure.sh b/tools/configure.sh
index d63a184c2c..d472fafab9 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -37,7 +37,7 @@ WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
 TOPDIR="${WD}/.."
 USAGE="
 
-USAGE: ${0} [-d] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>/<config-name>
+USAGE: ${0} [-d] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>/configs/<config-name>
 
 Where:
   -l selects the Linux (l) host environment.
@@ -49,7 +49,7 @@ Where:
   Default: Use host setup in the defconfig file
   Default Windows: Cygwin
   <board-name> is the name of the board in the boards directory
-  <config-name> is the name of the board configuration sub-directory
+  configs/<config-name> is the name of the board configuration sub-directory
   <app-dir> is the path to the apps/ directory, relative to the nuttx
      directory
 
@@ -108,7 +108,7 @@ while [ ! -z "$1" ]; do
     *)
       if [ ! -z "${boardconfig}" ]; then
         echo ""
-        echo "<board/config> defined twice"
+        echo "<board/configs/config> defined twice"
         echo "$USAGE"
         exit 1
       fi
@@ -122,7 +122,7 @@ done
 
 if [ -z "${boardconfig}" ]; then
   echo ""
-  echo "Missing <board/config> argument"
+  echo "Missing <board/configs/config> argument"
   echo "$USAGE"
   exit 2
 fi
@@ -152,7 +152,7 @@ dest_makedefs="${TOPDIR}/Make.defs"
 
 if [ ! -r "${src_makedefs}" ]; then
   boardpath=`dirname $configpath`
-  src_makedefs="${boardpath}/scripts/Make.defs"
+  src_makedefs="${boardpath}/../scripts/Make.defs"
 
   if [ ! -r "${src_makedefs}" ]; then
     echo "File Make.defs could not be found"