diff --git a/configs/amber/scripts/hello.ld b/configs/amber/scripts/amber.ld
similarity index 100%
rename from configs/amber/scripts/hello.ld
rename to configs/amber/scripts/amber.ld
diff --git a/configs/efm32gg-stk3700/nsh/Make.defs b/configs/efm32gg-stk3700/scripts/Make.defs
similarity index 100%
rename from configs/efm32gg-stk3700/nsh/Make.defs
rename to configs/efm32gg-stk3700/scripts/Make.defs
diff --git a/configs/lpc4330-xplorer/nsh/Make.defs b/configs/lpc4330-xplorer/scripts/Make.defs
similarity index 100%
rename from configs/lpc4330-xplorer/nsh/Make.defs
rename to configs/lpc4330-xplorer/scripts/Make.defs
diff --git a/configs/lpc4337-ws/nsh/Make.defs b/configs/lpc4337-ws/scripts/Make.defs
similarity index 100%
rename from configs/lpc4337-ws/nsh/Make.defs
rename to configs/lpc4337-ws/scripts/Make.defs
diff --git a/configs/lpc4357-evb/nsh/Make.defs b/configs/lpc4357-evb/scripts/Make.defs
similarity index 100%
rename from configs/lpc4357-evb/nsh/Make.defs
rename to configs/lpc4357-evb/scripts/Make.defs
diff --git a/configs/lpc4370-link2/nsh/Make.defs b/configs/lpc4370-link2/scripts/Make.defs
similarity index 100%
rename from configs/lpc4370-link2/nsh/Make.defs
rename to configs/lpc4370-link2/scripts/Make.defs
diff --git a/configs/lpcxpresso-lpc1115/nsh/Make.defs b/configs/lpcxpresso-lpc1115/scripts/Make.defs
similarity index 100%
rename from configs/lpcxpresso-lpc1115/nsh/Make.defs
rename to configs/lpcxpresso-lpc1115/scripts/Make.defs
diff --git a/configs/lpcxpresso-lpc1115/scripts/ld.script b/configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
similarity index 100%
rename from configs/lpcxpresso-lpc1115/scripts/ld.script
rename to configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
diff --git a/configs/micropendous3/hello/Make.defs b/configs/micropendous3/scripts/Make.defs
similarity index 100%
rename from configs/micropendous3/hello/Make.defs
rename to configs/micropendous3/scripts/Make.defs
diff --git a/configs/micropendous3/hello/ld.script b/configs/micropendous3/scripts/micropendous3.ld
similarity index 100%
rename from configs/micropendous3/hello/ld.script
rename to configs/micropendous3/scripts/micropendous3.ld
diff --git a/configs/moxa/nsh/Make.defs b/configs/moxa/scripts/Make.defs
similarity index 100%
rename from configs/moxa/nsh/Make.defs
rename to configs/moxa/scripts/Make.defs
diff --git a/configs/moxa/scripts/ld.script b/configs/moxa/scripts/moxa.ld
similarity index 100%
rename from configs/moxa/scripts/ld.script
rename to configs/moxa/scripts/moxa.ld
diff --git a/configs/mx1ads/ostest/Make.defs b/configs/mx1ads/scripts/Make.defs
similarity index 100%
rename from configs/mx1ads/ostest/Make.defs
rename to configs/mx1ads/scripts/Make.defs
diff --git a/configs/mx1ads/ostest/ld.script b/configs/mx1ads/scripts/mx1ads.ld
similarity index 100%
rename from configs/mx1ads/ostest/ld.script
rename to configs/mx1ads/scripts/mx1ads.ld
diff --git a/configs/ne64badge/ostest/Make.defs b/configs/ne64badge/scripts/Make.defs
similarity index 100%
rename from configs/ne64badge/ostest/Make.defs
rename to configs/ne64badge/scripts/Make.defs
diff --git a/configs/ne64badge/ostest/ld.script.banked b/configs/ne64badge/scripts/ne64badge-banked.ld
similarity index 100%
rename from configs/ne64badge/ostest/ld.script.banked
rename to configs/ne64badge/scripts/ne64badge-banked.ld
diff --git a/configs/ne64badge/ostest/ld.script.nonbanked b/configs/ne64badge/scripts/ne64badge-nonbanked.ld
similarity index 100%
rename from configs/ne64badge/ostest/ld.script.nonbanked
rename to configs/ne64badge/scripts/ne64badge-nonbanked.ld
diff --git a/configs/nr5m100-nexys4/nsh/Make.defs b/configs/nr5m100-nexys4/scripts/Make.defs
similarity index 100%
rename from configs/nr5m100-nexys4/nsh/Make.defs
rename to configs/nr5m100-nexys4/scripts/Make.defs
diff --git a/configs/nucleo-144/f746-evalos/Make.defs b/configs/nucleo-144/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-144/f746-evalos/Make.defs
rename to configs/nucleo-144/scripts/Make.defs
diff --git a/configs/nucleo-f072rb/nsh/Make.defs b/configs/nucleo-f072rb/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-f072rb/nsh/Make.defs
rename to configs/nucleo-f072rb/scripts/Make.defs
diff --git a/configs/nucleo-f091rc/nsh/Make.defs b/configs/nucleo-f091rc/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-f091rc/nsh/Make.defs
rename to configs/nucleo-f091rc/scripts/Make.defs
diff --git a/configs/nucleo-f4x1re/f401-nsh/Make.defs b/configs/nucleo-f4x1re/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-f4x1re/f401-nsh/Make.defs
rename to configs/nucleo-f4x1re/scripts/Make.defs
diff --git a/configs/nucleo-l432kc/nsh/Make.defs b/configs/nucleo-l432kc/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-l432kc/nsh/Make.defs
rename to configs/nucleo-l432kc/scripts/Make.defs
diff --git a/configs/nucleo-l452re/nsh/Make.defs b/configs/nucleo-l452re/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-l452re/nsh/Make.defs
rename to configs/nucleo-l452re/scripts/Make.defs
diff --git a/configs/nucleo-l476rg/nsh/Make.defs b/configs/nucleo-l476rg/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-l476rg/nsh/Make.defs
rename to configs/nucleo-l476rg/scripts/Make.defs
diff --git a/configs/nucleo-l496zg/nsh/Make.defs b/configs/nucleo-l496zg/scripts/Make.defs
similarity index 100%
rename from configs/nucleo-l496zg/nsh/Make.defs
rename to configs/nucleo-l496zg/scripts/Make.defs
diff --git a/configs/nutiny-nuc120/nsh/Make.defs b/configs/nutiny-nuc120/scripts/Make.defs
similarity index 100%
rename from configs/nutiny-nuc120/nsh/Make.defs
rename to configs/nutiny-nuc120/scripts/Make.defs
diff --git a/configs/p112/ostest/Make.defs b/configs/p112/scripts/Make.defs
similarity index 100%
rename from configs/p112/ostest/Make.defs
rename to configs/p112/scripts/Make.defs
diff --git a/configs/pcblogic-pic32mx/nsh/Make.defs b/configs/pcblogic-pic32mx/scripts/Make.defs
similarity index 100%
rename from configs/pcblogic-pic32mx/nsh/Make.defs
rename to configs/pcblogic-pic32mx/scripts/Make.defs
diff --git a/configs/pcblogic-pic32mx/nsh/ld.script b/configs/pcblogic-pic32mx/scripts/nsh
similarity index 100%
rename from configs/pcblogic-pic32mx/nsh/ld.script
rename to configs/pcblogic-pic32mx/scripts/nsh
diff --git a/configs/pcduino-a10/nsh/Make.defs b/configs/pcduino-a10/scripts/Make.defs
similarity index 100%
rename from configs/pcduino-a10/nsh/Make.defs
rename to configs/pcduino-a10/scripts/Make.defs
diff --git a/configs/pic32mx7mmb/nsh/Make.defs b/configs/pic32mx7mmb/scripts/Make.defs
similarity index 100%
rename from configs/pic32mx7mmb/nsh/Make.defs
rename to configs/pic32mx7mmb/scripts/Make.defs
diff --git a/configs/pic32mz-starterkit/nsh/Make.defs b/configs/pic32mz-starterkit/scripts/Make.defs
similarity index 100%
rename from configs/pic32mz-starterkit/nsh/Make.defs
rename to configs/pic32mz-starterkit/scripts/Make.defs
diff --git a/configs/sam4cmp-db/nsh/Make.defs b/configs/sam4cmp-db/scripts/Make.defs
similarity index 100%
rename from configs/sam4cmp-db/nsh/Make.defs
rename to configs/sam4cmp-db/scripts/Make.defs
diff --git a/configs/sam4l-xplained/nsh/Make.defs b/configs/sam4l-xplained/scripts/Make.defs
similarity index 100%
rename from configs/sam4l-xplained/nsh/Make.defs
rename to configs/sam4l-xplained/scripts/Make.defs
diff --git a/configs/sam4s-xplained-pro/nsh/Make.defs b/configs/sam4s-xplained-pro/scripts/Make.defs
similarity index 100%
rename from configs/sam4s-xplained-pro/nsh/Make.defs
rename to configs/sam4s-xplained-pro/scripts/Make.defs
diff --git a/configs/sam4s-xplained/nsh/Make.defs b/configs/sam4s-xplained/scripts/Make.defs
similarity index 100%
rename from configs/sam4s-xplained/nsh/Make.defs
rename to configs/sam4s-xplained/scripts/Make.defs
diff --git a/configs/sama5d2-xult/nsh/Make.defs b/configs/sama5d2-xult/scripts/Make.defs
similarity index 100%
rename from configs/sama5d2-xult/nsh/Make.defs
rename to configs/sama5d2-xult/scripts/Make.defs
diff --git a/configs/samd20-xplained/nsh/Make.defs b/configs/samd20-xplained/scripts/Make.defs
similarity index 100%
rename from configs/samd20-xplained/nsh/Make.defs
rename to configs/samd20-xplained/scripts/Make.defs
diff --git a/configs/samd21-xplained/nsh/Make.defs b/configs/samd21-xplained/scripts/Make.defs
similarity index 100%
rename from configs/samd21-xplained/nsh/Make.defs
rename to configs/samd21-xplained/scripts/Make.defs
diff --git a/configs/saml21-xplained/nsh/Make.defs b/configs/saml21-xplained/scripts/Make.defs
similarity index 100%
rename from configs/saml21-xplained/nsh/Make.defs
rename to configs/saml21-xplained/scripts/Make.defs
diff --git a/configs/skp16c26/ostest/Make.defs b/configs/skp16c26/scripts/Make.defs
similarity index 100%
rename from configs/skp16c26/ostest/Make.defs
rename to configs/skp16c26/scripts/Make.defs
diff --git a/configs/skp16c26/ostest/ld.script b/configs/skp16c26/scripts/ostest
similarity index 100%
rename from configs/skp16c26/ostest/ld.script
rename to configs/skp16c26/scripts/ostest
diff --git a/configs/stm32f0discovery/nsh/Make.defs b/configs/stm32f0discovery/scripts/Make.defs
similarity index 100%
rename from configs/stm32f0discovery/nsh/Make.defs
rename to configs/stm32f0discovery/scripts/Make.defs
diff --git a/configs/stm32f411e-disco/nsh/Make.defs b/configs/stm32f411e-disco/scripts/Make.defs
similarity index 100%
rename from configs/stm32f411e-disco/nsh/Make.defs
rename to configs/stm32f411e-disco/scripts/Make.defs
diff --git a/configs/stm32f746-ws/nsh/Make.defs b/configs/stm32f746-ws/scripts/Make.defs
similarity index 100%
rename from configs/stm32f746-ws/nsh/Make.defs
rename to configs/stm32f746-ws/scripts/Make.defs
diff --git a/configs/stm32f746g-disco/nsh/Make.defs b/configs/stm32f746g-disco/scripts/Make.defs
similarity index 100%
rename from configs/stm32f746g-disco/nsh/Make.defs
rename to configs/stm32f746g-disco/scripts/Make.defs
diff --git a/configs/stm32l476-mdk/nsh/Make.defs b/configs/stm32l476-mdk/scripts/Make.defs
similarity index 100%
rename from configs/stm32l476-mdk/nsh/Make.defs
rename to configs/stm32l476-mdk/scripts/Make.defs
diff --git a/configs/stm32l476vg-disco/nsh/Make.defs b/configs/stm32l476vg-disco/scripts/Make.defs
similarity index 100%
rename from configs/stm32l476vg-disco/nsh/Make.defs
rename to configs/stm32l476vg-disco/scripts/Make.defs
diff --git a/configs/stm32ldiscovery/nsh/Make.defs b/configs/stm32ldiscovery/scripts/Make.defs
similarity index 100%
rename from configs/stm32ldiscovery/nsh/Make.defs
rename to configs/stm32ldiscovery/scripts/Make.defs
diff --git a/configs/stm32vldiscovery/nsh/Make.defs b/configs/stm32vldiscovery/scripts/Make.defs
similarity index 100%
rename from configs/stm32vldiscovery/nsh/Make.defs
rename to configs/stm32vldiscovery/scripts/Make.defs
diff --git a/configs/teensy-lc/nsh/Make.defs b/configs/teensy-lc/scripts/Make.defs
similarity index 100%
rename from configs/teensy-lc/nsh/Make.defs
rename to configs/teensy-lc/scripts/Make.defs
diff --git a/configs/tm4c123g-launchpad/nsh/Make.defs b/configs/tm4c123g-launchpad/scripts/Make.defs
similarity index 100%
rename from configs/tm4c123g-launchpad/nsh/Make.defs
rename to configs/tm4c123g-launchpad/scripts/Make.defs
diff --git a/configs/twr-k60n512/nsh/Make.defs b/configs/twr-k60n512/scripts/Make.defs
similarity index 100%
rename from configs/twr-k60n512/nsh/Make.defs
rename to configs/twr-k60n512/scripts/Make.defs
diff --git a/configs/u-blox-c027/nsh/Make.defs b/configs/u-blox-c027/scripts/Make.defs
similarity index 100%
rename from configs/u-blox-c027/nsh/Make.defs
rename to configs/u-blox-c027/scripts/Make.defs
diff --git a/configs/ubw32/nsh/Make.defs b/configs/ubw32/scripts/Make.defs
similarity index 100%
rename from configs/ubw32/nsh/Make.defs
rename to configs/ubw32/scripts/Make.defs
diff --git a/configs/xmc4500-relax/nsh/Make.defs b/configs/xmc4500-relax/scripts/Make.defs
similarity index 100%
rename from configs/xmc4500-relax/nsh/Make.defs
rename to configs/xmc4500-relax/scripts/Make.defs
diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/scripts/Make.defs
similarity index 100%
rename from configs/z8encore000zco/ostest/Make.defs
rename to configs/z8encore000zco/scripts/Make.defs
diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/scripts/Make.defs
similarity index 100%
rename from configs/z8f64200100kit/ostest/Make.defs
rename to configs/z8f64200100kit/scripts/Make.defs