diff --git a/README b/README
index 73aa3a630..b99c6d813 100644
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ e.g.:
 
 ```
 openocd -f interface/ftdi/jtagkey2.cfg -c "transport select jtag" \
-        -f target/ti_calypso.cfg
+        -f target/ti/calypso.cfg
 ```
 
 ```
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 82d2a9416..533290382 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -1771,10 +1771,10 @@ There are more complex examples too, with chips that have
 multiple TAPs. Ones worth looking at include:
 
 @itemize
-@item @file{target/omap3530.cfg} -- with disabled ARM and DSP,
+@item @file{target/ti/omap3530.cfg} -- with disabled ARM and DSP,
 plus a JRC to enable them
 @item @file{target/str912.cfg} -- with flash, CPU, and boundary scan
-@item @file{target/ti_dm355.cfg} -- with ETM, ARM, and JRC (this JRC
+@item @file{target/ti/dm355.cfg} -- with ETM, ARM, and JRC (this JRC
 is not currently used)
 @end itemize
 
diff --git a/tcl/board/am3517evm.cfg b/tcl/board/am3517evm.cfg
index 0b19be68b..c76516608 100644
--- a/tcl/board/am3517evm.cfg
+++ b/tcl/board/am3517evm.cfg
@@ -13,7 +13,7 @@
 # http://processors.wiki.ti.com/index.php?title=How_to_Find_the_Silicon_Revision_of_your_OMAP35x
 
 set CHIPTYPE "am35x"
-source [find target/amdm37x.cfg]
+source [find target/ti/amdm37x.cfg]
 
 # The TI-14 JTAG connector does not have srst.  CPU reset is handled in
 # hardware.
diff --git a/tcl/board/da850evm.cfg b/tcl/board/da850evm.cfg
index 12de3a7e3..736467cf6 100644
--- a/tcl/board/da850evm.cfg
+++ b/tcl/board/da850evm.cfg
@@ -4,7 +4,7 @@
 # http://focus.ti.com/dsp/docs/thirdparty/catalog/devtoolsproductfolder.tsp?actionPerformed=productFolder&productId=5939
 # http://www.logicpd.com/products/development-kits/zoom-omap-l138-evm-development-kit
 
-source [find target/omapl138.cfg]
+source [find target/ti/omapl138.cfg]
 
 reset_config trst_and_srst separate
 
diff --git a/tcl/board/dm355evm.cfg b/tcl/board/dm355evm.cfg
index 0dbffa839..d7102b372 100644
--- a/tcl/board/dm355evm.cfg
+++ b/tcl/board/dm355evm.cfg
@@ -4,7 +4,7 @@
 #   http://focus.ti.com/docs/toolsw/folders/print/tmdsevm355.html
 #   http://c6000.spectrumdigital.com/evmdm355/
 
-source [find target/ti_dm355.cfg]
+source [find target/ti/dm355.cfg]
 
 reset_config trst_and_srst separate
 
diff --git a/tcl/board/dm365evm.cfg b/tcl/board/dm365evm.cfg
index 15db24c20..113a4a3d1 100644
--- a/tcl/board/dm365evm.cfg
+++ b/tcl/board/dm365evm.cfg
@@ -4,7 +4,7 @@
 #   http://focus.ti.com/docs/toolsw/folders/print/tmdxevm365.html
 #   http://support.spectrumdigital.com/boards/evmdm365
 
-source [find target/ti_dm365.cfg]
+source [find target/ti/dm365.cfg]
 
 # NOTE:  in Rev C boards, the CPLD ignores SRST from the ARM-20 JTAG
 # connector, so it doesn't affect generation of the reset signal.
diff --git a/tcl/board/dm6446evm.cfg b/tcl/board/dm6446evm.cfg
index 1236b8622..7f1b5b052 100644
--- a/tcl/board/dm6446evm.cfg
+++ b/tcl/board/dm6446evm.cfg
@@ -6,7 +6,7 @@
 # EVM is just the board; buy that at Spectrum.
 # The "kit" from TI also has: video camera, LCD video monitor, more.
 
-source [find target/ti_dm6446.cfg]
+source [find target/ti/dm6446.cfg]
 
 # J4 controls what CS2 hooks up to, usually NOR or NAND flash.
 # S3.1/S3.2 controls boot mode, which may force J4 and S3.3 settings.
diff --git a/tcl/board/ek-lm3s1968.cfg b/tcl/board/ek-lm3s1968.cfg
index c794a17a0..382865340 100644
--- a/tcl/board/ek-lm3s1968.cfg
+++ b/tcl/board/ek-lm3s1968.cfg
@@ -18,4 +18,4 @@ source [find interface/ftdi/luminary.cfg]
 # include the target config
 set WORKAREASIZE 0x2000
 set CHIPNAME lm3s1968
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s3748.cfg b/tcl/board/ek-lm3s3748.cfg
index 705cb64ce..c72af120f 100644
--- a/tcl/board/ek-lm3s3748.cfg
+++ b/tcl/board/ek-lm3s3748.cfg
@@ -13,4 +13,4 @@ source [find interface/ftdi/luminary.cfg]
 # 20k working area
 set WORKAREASIZE 0x4000
 set CHIPNAME lm3s3748
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s6965.cfg b/tcl/board/ek-lm3s6965.cfg
index ee4e15f8a..3ce2c5167 100644
--- a/tcl/board/ek-lm3s6965.cfg
+++ b/tcl/board/ek-lm3s6965.cfg
@@ -14,4 +14,4 @@ source [find interface/ftdi/luminary.cfg]
 set WORKAREASIZE 0x5000
 set CHIPNAME lm3s6965
 # include the target config
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s811-revb.cfg b/tcl/board/ek-lm3s811-revb.cfg
index f968eece5..2006992b3 100644
--- a/tcl/board/ek-lm3s811-revb.cfg
+++ b/tcl/board/ek-lm3s811-revb.cfg
@@ -13,4 +13,4 @@ source [find interface/ftdi/luminary-lm3s811.cfg]
 # include the target config
 set WORKAREASIZE 0x2000
 set CHIPNAME lm3s811
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s811.cfg b/tcl/board/ek-lm3s811.cfg
index 0cf36c284..9a36221ea 100644
--- a/tcl/board/ek-lm3s811.cfg
+++ b/tcl/board/ek-lm3s811.cfg
@@ -14,4 +14,4 @@ source [find interface/ftdi/luminary.cfg]
 # include the target config
 set WORKAREASIZE 0x2000
 set CHIPNAME lm3s811
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s8962.cfg b/tcl/board/ek-lm3s8962.cfg
index 71a1b1090..f58147edd 100644
--- a/tcl/board/ek-lm3s8962.cfg
+++ b/tcl/board/ek-lm3s8962.cfg
@@ -14,4 +14,4 @@ source [find interface/ftdi/luminary.cfg]
 set WORKAREASIZE 0x10000
 set CHIPNAME lm3s8962
 # include the target config
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s9b9x.cfg b/tcl/board/ek-lm3s9b9x.cfg
index 289a2cc09..b823b56cd 100644
--- a/tcl/board/ek-lm3s9b9x.cfg
+++ b/tcl/board/ek-lm3s9b9x.cfg
@@ -13,4 +13,4 @@ source [find interface/ftdi/luminary-icdi.cfg]
 
 set WORKAREASIZE 0x4000
 set CHIPNAME lm3s9b9x
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm3s9d92.cfg b/tcl/board/ek-lm3s9d92.cfg
index 08bbbdb58..9f4dcaa35 100644
--- a/tcl/board/ek-lm3s9d92.cfg
+++ b/tcl/board/ek-lm3s9d92.cfg
@@ -13,4 +13,4 @@ source [find interface/ftdi/luminary-icdi.cfg]
 # 64k working area
 set WORKAREASIZE 0x10000
 set CHIPNAME lm3s9d92
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm4f120xl.cfg b/tcl/board/ek-lm4f120xl.cfg
index 44b1b1ea1..b1ab98668 100644
--- a/tcl/board/ek-lm4f120xl.cfg
+++ b/tcl/board/ek-lm4f120xl.cfg
@@ -16,4 +16,4 @@ transport select jtag
 
 set WORKAREASIZE 0x8000
 set CHIPNAME lm4f120h5qr
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ek-lm4f232.cfg b/tcl/board/ek-lm4f232.cfg
index bb7f9ea5b..1fd05bb75 100644
--- a/tcl/board/ek-lm4f232.cfg
+++ b/tcl/board/ek-lm4f232.cfg
@@ -16,4 +16,4 @@ transport select jtag
 
 set WORKAREASIZE 0x8000
 set CHIPNAME lm4f23x
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/linksys-wag200g.cfg b/tcl/board/linksys-wag200g.cfg
index 26900a7d7..2150baf89 100644
--- a/tcl/board/linksys-wag200g.cfg
+++ b/tcl/board/linksys-wag200g.cfg
@@ -22,7 +22,7 @@ set partition_list {
     adam2env	{ "Adam2 environment"		0x903f0000 0x00010000 }
 }
 
-source [find target/ti-ar7.cfg]
+source [find target/ti/ar7.cfg]
 
 # External 4MB MXIC 29LV320MBTC Flash (Manufacturer/Device: 0x00c2 0x227e)
 set _FLASHNAME $_CHIPNAME.flash
diff --git a/tcl/board/netgear-dg834v3.cfg b/tcl/board/netgear-dg834v3.cfg
index a9938889c..4292ac406 100644
--- a/tcl/board/netgear-dg834v3.cfg
+++ b/tcl/board/netgear-dg834v3.cfg
@@ -12,7 +12,7 @@ set partition_list {
     config	{ "Bootloader config space"	0x903f0000 0x00010000 }
 }
 
-source [find target/ti-ar7.cfg]
+source [find target/ti/ar7.cfg]
 
 # External 16MB SDRAM - disabled as we use internal sram
 #$_TARGETNAME configure -work-area-phys 0x80000000 -work-area-size 0x00001000
diff --git a/tcl/board/omap2420_h4.cfg b/tcl/board/omap2420_h4.cfg
index ec169654f..b3e9d7dab 100644
--- a/tcl/board/omap2420_h4.cfg
+++ b/tcl/board/omap2420_h4.cfg
@@ -2,7 +2,7 @@
 
 # OMAP2420 SDP board ("H4")
 
-source [find target/omap2420.cfg]
+source [find target/ti/omap2420.cfg]
 
 # NOTE: this assumes you're *NOT* using a TI-14 connector.
 reset_config trst_and_srst separate
diff --git a/tcl/board/osk5912.cfg b/tcl/board/osk5912.cfg
index 0759a27ac..1f94c67a2 100644
--- a/tcl/board/osk5912.cfg
+++ b/tcl/board/osk5912.cfg
@@ -2,7 +2,7 @@
 
 # http://omap.spectrumdigital.com/osk5912/
 
-source [find target/omap5912.cfg]
+source [find target/ti/omap5912.cfg]
 
 # NOTE: this assumes you're using the ARM 20-pin ("Multi-ICE")
 # JTAG connector, and accordingly have J1 connecting pins 1 & 2.
diff --git a/tcl/board/phone_se_j100i.cfg b/tcl/board/phone_se_j100i.cfg
index 70387ee15..09ea703c8 100644
--- a/tcl/board/phone_se_j100i.cfg
+++ b/tcl/board/phone_se_j100i.cfg
@@ -6,7 +6,7 @@
 # more information can be found on
 # http://bb.osmocom.org/trac/wiki/SonyEricssonJ100i
 #
-source [find target/ti_calypso.cfg]
+source [find target/ti/calypso.cfg]
 
 # external flash
 
diff --git a/tcl/board/ti/launchxl2-tms57012.cfg b/tcl/board/ti/launchxl2-tms57012.cfg
index 99cb26e20..ba305f691 100644
--- a/tcl/board/ti/launchxl2-tms57012.cfg
+++ b/tcl/board/ti/launchxl2-tms57012.cfg
@@ -7,4 +7,4 @@ source [find interface/xds110.cfg]
 
 transport select jtag
 
-source [find target/ti_tms570ls1x.cfg]
+source [find target/ti/tms570ls1x.cfg]
diff --git a/tcl/board/ti_am243_launchpad.cfg b/tcl/board/ti_am243_launchpad.cfg
index aa75dda88..6833cdd67 100644
--- a/tcl/board/ti_am243_launchpad.cfg
+++ b/tcl/board/ti_am243_launchpad.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am243
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am261_launchpad.cfg b/tcl/board/ti_am261_launchpad.cfg
index c6c4609ed..0a99d8b1e 100644
--- a/tcl/board/ti_am261_launchpad.cfg
+++ b/tcl/board/ti_am261_launchpad.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am261
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am263_launchpad.cfg b/tcl/board/ti_am263_launchpad.cfg
index a07a21b3d..7d603d386 100644
--- a/tcl/board/ti_am263_launchpad.cfg
+++ b/tcl/board/ti_am263_launchpad.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am263
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am263p_launchpad.cfg b/tcl/board/ti_am263p_launchpad.cfg
index 96e06fab6..25ae80d63 100644
--- a/tcl/board/ti_am263p_launchpad.cfg
+++ b/tcl/board/ti_am263p_launchpad.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am263p
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am273_launchpad.cfg b/tcl/board/ti_am273_launchpad.cfg
index c17170bf1..6f10b6b62 100644
--- a/tcl/board/ti_am273_launchpad.cfg
+++ b/tcl/board/ti_am273_launchpad.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am273
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am335xevm.cfg b/tcl/board/ti_am335xevm.cfg
index af058ecf7..cc64d5877 100644
--- a/tcl/board/ti_am335xevm.cfg
+++ b/tcl/board/ti_am335xevm.cfg
@@ -7,6 +7,6 @@
 #
 jtag_rclk 6000
 
-source [find target/am335x.cfg]
+source [find target/ti/am335x.cfg]
 
 reset_config trst_and_srst
diff --git a/tcl/board/ti_am437x_idk.cfg b/tcl/board/ti_am437x_idk.cfg
index b4277628e..30f2580f6 100644
--- a/tcl/board/ti_am437x_idk.cfg
+++ b/tcl/board/ti_am437x_idk.cfg
@@ -8,7 +8,7 @@ source [find interface/ftdi/xds100v2.cfg]
 transport select jtag
 adapter speed 30000
 
-source [find target/am437x.cfg]
+source [find target/ti/am437x.cfg]
 $_TARGETNAME configure -event reset-init { init_platform 0x61a11b32 }
 
 reset_config trst_and_srst
diff --git a/tcl/board/ti_am43xx_evm.cfg b/tcl/board/ti_am43xx_evm.cfg
index 005421f42..1c3961820 100644
--- a/tcl/board/ti_am43xx_evm.cfg
+++ b/tcl/board/ti_am43xx_evm.cfg
@@ -4,6 +4,6 @@
 transport select jtag
 adapter speed 16000
 
-source [find target/am437x.cfg]
+source [find target/ti/am437x.cfg]
 
 reset_config trst_and_srst
diff --git a/tcl/board/ti_am625_swd_native.cfg b/tcl/board/ti_am625_swd_native.cfg
index 65314fe5d..8891e021a 100644
--- a/tcl/board/ti_am625_swd_native.cfg
+++ b/tcl/board/ti_am625_swd_native.cfg
@@ -20,4 +20,4 @@ if { ![info exists SOC] } {
 	set SOC am625
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_am625evm.cfg b/tcl/board/ti_am625evm.cfg
index 4906fd096..2df13cdae 100644
--- a/tcl/board/ti_am625evm.cfg
+++ b/tcl/board/ti_am625evm.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am625
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_am62a7_swd_native.cfg b/tcl/board/ti_am62a7_swd_native.cfg
index 3d5e89228..4d5512688 100644
--- a/tcl/board/ti_am62a7_swd_native.cfg
+++ b/tcl/board/ti_am62a7_swd_native.cfg
@@ -20,4 +20,4 @@ if { ![info exists SOC] } {
 	set SOC am62a7
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_am62a7evm.cfg b/tcl/board/ti_am62a7evm.cfg
index e40790950..1c90be8b1 100644
--- a/tcl/board/ti_am62a7evm.cfg
+++ b/tcl/board/ti_am62a7evm.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am62a7
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_am62levm.cfg b/tcl/board/ti_am62levm.cfg
index 6debdd49f..53ac7a5a0 100644
--- a/tcl/board/ti_am62levm.cfg
+++ b/tcl/board/ti_am62levm.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC am62l
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_am62p_swd_native.cfg b/tcl/board/ti_am62p_swd_native.cfg
index a8c6bd120..55e6ea3d7 100644
--- a/tcl/board/ti_am62p_swd_native.cfg
+++ b/tcl/board/ti_am62p_swd_native.cfg
@@ -20,4 +20,4 @@ if { ![info exists SOC] } {
 	set SOC am62p
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_am62pevm.cfg b/tcl/board/ti_am62pevm.cfg
index 2322b3d94..6c7f99a33 100644
--- a/tcl/board/ti_am62pevm.cfg
+++ b/tcl/board/ti_am62pevm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC am62p
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_am642evm.cfg b/tcl/board/ti_am642evm.cfg
index e97fdcf13..a6cfacd80 100644
--- a/tcl/board/ti_am642evm.cfg
+++ b/tcl/board/ti_am642evm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC am642
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 250
diff --git a/tcl/board/ti_am64xx_swd_native.cfg b/tcl/board/ti_am64xx_swd_native.cfg
index d3727149e..65e9e7c56 100644
--- a/tcl/board/ti_am64xx_swd_native.cfg
+++ b/tcl/board/ti_am64xx_swd_native.cfg
@@ -20,4 +20,4 @@ if { ![info exists SOC] } {
 	set SOC am642
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_am654evm.cfg b/tcl/board/ti_am654evm.cfg
index a661f6068..e812feb6c 100644
--- a/tcl/board/ti_am654evm.cfg
+++ b/tcl/board/ti_am654evm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC am654
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_beagleboard.cfg b/tcl/board/ti_beagleboard.cfg
index 6767bd6df..735708e80 100644
--- a/tcl/board/ti_beagleboard.cfg
+++ b/tcl/board/ti_beagleboard.cfg
@@ -6,7 +6,7 @@
 # Fall back to 6MHz if RTCK is not supported
 jtag_rclk 6000
 
-source [find target/omap3530.cfg]
+source [find target/ti/omap3530.cfg]
 
 # TI-14 JTAG connector
 reset_config trst_only
diff --git a/tcl/board/ti_beagleboard_xm.cfg b/tcl/board/ti_beagleboard_xm.cfg
index fd176a001..cd9a53c5f 100644
--- a/tcl/board/ti_beagleboard_xm.cfg
+++ b/tcl/board/ti_beagleboard_xm.cfg
@@ -4,7 +4,7 @@
 #  http://beagleboard.org
 
 set CHIPTYPE "dm37x"
-source [find target/amdm37x.cfg]
+source [find target/ti/amdm37x.cfg]
 
 # The TI-14 JTAG connector does not have srst.  CPU reset is handled in
 # hardware.
diff --git a/tcl/board/ti_beaglebone-base.cfg b/tcl/board/ti_beaglebone-base.cfg
index 566f0a4b3..db8432f4c 100644
--- a/tcl/board/ti_beaglebone-base.cfg
+++ b/tcl/board/ti_beaglebone-base.cfg
@@ -3,4 +3,4 @@
 # AM335x Beaglebone family base configuration
 #  http://beagleboard.org/bone
 
-source [find target/am335x.cfg]
+source [find target/ti/am335x.cfg]
diff --git a/tcl/board/ti_blaze.cfg b/tcl/board/ti_blaze.cfg
index e28b05b83..e54903527 100644
--- a/tcl/board/ti_blaze.cfg
+++ b/tcl/board/ti_blaze.cfg
@@ -2,6 +2,6 @@
 
 jtag_rclk 6000
 
-source [find target/omap4430.cfg]
+source [find target/ti/omap4430.cfg]
 
 reset_config trst_and_srst
diff --git a/tcl/board/ti_cc13x0_launchpad.cfg b/tcl/board/ti_cc13x0_launchpad.cfg
index f6dfbcda3..e6904456c 100644
--- a/tcl/board/ti_cc13x0_launchpad.cfg
+++ b/tcl/board/ti_cc13x0_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 transport select jtag
 adapter speed 5500
-source [find target/ti_cc13x0.cfg]
+source [find target/ti/cc13x0.cfg]
diff --git a/tcl/board/ti_cc13x2_launchpad.cfg b/tcl/board/ti_cc13x2_launchpad.cfg
index 900842a2f..1653224d1 100644
--- a/tcl/board/ti_cc13x2_launchpad.cfg
+++ b/tcl/board/ti_cc13x2_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 5500
 transport select jtag
-source [find target/ti_cc13x2.cfg]
+source [find target/ti/cc13x2.cfg]
diff --git a/tcl/board/ti_cc26x0_launchpad.cfg b/tcl/board/ti_cc26x0_launchpad.cfg
index 431383db1..8e57cf2a4 100644
--- a/tcl/board/ti_cc26x0_launchpad.cfg
+++ b/tcl/board/ti_cc26x0_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 5500
 transport select jtag
-source [find target/ti_cc26x0.cfg]
+source [find target/ti/cc26x0.cfg]
diff --git a/tcl/board/ti_cc26x2_launchpad.cfg b/tcl/board/ti_cc26x2_launchpad.cfg
index 133f57e07..931270e21 100644
--- a/tcl/board/ti_cc26x2_launchpad.cfg
+++ b/tcl/board/ti_cc26x2_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 5500
 transport select jtag
-source [find target/ti_cc26x2.cfg]
+source [find target/ti/cc26x2.cfg]
diff --git a/tcl/board/ti_cc26x2x7_launchpad.cfg b/tcl/board/ti_cc26x2x7_launchpad.cfg
index 9e6e72e89..c1b6e059a 100644
--- a/tcl/board/ti_cc26x2x7_launchpad.cfg
+++ b/tcl/board/ti_cc26x2x7_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 5500
 transport select jtag
-source [find target/ti_cc26x2x7.cfg]
+source [find target/ti/cc26x2x7.cfg]
diff --git a/tcl/board/ti_cc3200_launchxl.cfg b/tcl/board/ti_cc3200_launchxl.cfg
index 5f39b8a83..ca78cd19e 100644
--- a/tcl/board/ti_cc3200_launchxl.cfg
+++ b/tcl/board/ti_cc3200_launchxl.cfg
@@ -17,7 +17,7 @@ if { [info exists TRANSPORT] } {
 adapter speed 2500
 
 set WORKAREASIZE 0x40000
-source [find target/ti_cc32xx.cfg]
+source [find target/ti/cc32xx.cfg]
 
 reset_config srst_only
 adapter srst delay 1100
diff --git a/tcl/board/ti_cc3220sf_launchpad.cfg b/tcl/board/ti_cc3220sf_launchpad.cfg
index fe34554df..560e3ee25 100644
--- a/tcl/board/ti_cc3220sf_launchpad.cfg
+++ b/tcl/board/ti_cc3220sf_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 8500
 transport select swd
-source [find target/ti_cc3220sf.cfg]
+source [find target/ti/cc3220sf.cfg]
diff --git a/tcl/board/ti_cc32xx_launchpad.cfg b/tcl/board/ti_cc32xx_launchpad.cfg
index 343da485d..41da72c3c 100644
--- a/tcl/board/ti_cc32xx_launchpad.cfg
+++ b/tcl/board/ti_cc32xx_launchpad.cfg
@@ -6,7 +6,7 @@
 source [find interface/xds110.cfg]
 adapter speed 8500
 transport select swd
-source [find target/ti_cc32xx.cfg]
+source [find target/ti/cc32xx.cfg]
 
 reset_config srst_only
 adapter srst delay 1100
diff --git a/tcl/board/ti_dk-tm4c129.cfg b/tcl/board/ti_dk-tm4c129.cfg
index e0574fa87..d01b55966 100644
--- a/tcl/board/ti_dk-tm4c129.cfg
+++ b/tcl/board/ti_dk-tm4c129.cfg
@@ -13,4 +13,4 @@ transport select jtag
 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c129xnczad
 
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ti_ek-tm4c123gxl.cfg b/tcl/board/ti_ek-tm4c123gxl.cfg
index 7b8fc267f..2d1c1a771 100644
--- a/tcl/board/ti_ek-tm4c123gxl.cfg
+++ b/tcl/board/ti_ek-tm4c123gxl.cfg
@@ -12,4 +12,4 @@ transport select jtag
 
 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c123gh6pm
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ti_ek-tm4c1294xl.cfg b/tcl/board/ti_ek-tm4c1294xl.cfg
index 8cceb49c9..38e8f023b 100644
--- a/tcl/board/ti_ek-tm4c1294xl.cfg
+++ b/tcl/board/ti_ek-tm4c1294xl.cfg
@@ -13,4 +13,4 @@ transport select jtag
 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c1294ncpdt
 
-source [find target/stellaris.cfg]
+source [find target/ti/stellaris.cfg]
diff --git a/tcl/board/ti_j7200evm.cfg b/tcl/board/ti_j7200evm.cfg
index cc70056fb..7edeb3678 100644
--- a/tcl/board/ti_j7200evm.cfg
+++ b/tcl/board/ti_j7200evm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC j7200
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_j721e_swd_native.cfg b/tcl/board/ti_j721e_swd_native.cfg
index 38316387a..7b3f6060f 100644
--- a/tcl/board/ti_j721e_swd_native.cfg
+++ b/tcl/board/ti_j721e_swd_native.cfg
@@ -19,4 +19,4 @@ transport select swd
 if { ![info exists SOC] } {
         set SOC j721e
 }
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_j721evm.cfg b/tcl/board/ti_j721evm.cfg
index d0c4b7496..92e88234e 100644
--- a/tcl/board/ti_j721evm.cfg
+++ b/tcl/board/ti_j721evm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC j721e
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_j721s2evm.cfg b/tcl/board/ti_j721s2evm.cfg
index 72418b57b..f8e12b875 100644
--- a/tcl/board/ti_j721s2evm.cfg
+++ b/tcl/board/ti_j721s2evm.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC j721s2
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_j722s_swd_native.cfg b/tcl/board/ti_j722s_swd_native.cfg
index a171ec358..1bc60968c 100644
--- a/tcl/board/ti_j722s_swd_native.cfg
+++ b/tcl/board/ti_j722s_swd_native.cfg
@@ -21,4 +21,4 @@ if { ![info exists SOC] } {
 	set SOC j722s
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_j722sevm.cfg b/tcl/board/ti_j722sevm.cfg
index 6a5c2d9cd..c43e7abe5 100644
--- a/tcl/board/ti_j722sevm.cfg
+++ b/tcl/board/ti_j722sevm.cfg
@@ -19,6 +19,6 @@ if { ![info exists SOC] } {
 	set SOC j722s
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_j784s4_swd_native.cfg b/tcl/board/ti_j784s4_swd_native.cfg
index 13b2ac3b8..dd534248f 100644
--- a/tcl/board/ti_j784s4_swd_native.cfg
+++ b/tcl/board/ti_j784s4_swd_native.cfg
@@ -19,4 +19,4 @@ transport select swd
 if { ![info exists SOC] } {
         set SOC j784s4
 }
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
diff --git a/tcl/board/ti_j784s4evm.cfg b/tcl/board/ti_j784s4evm.cfg
index d23dc8ce6..a8a5af2e0 100644
--- a/tcl/board/ti_j784s4evm.cfg
+++ b/tcl/board/ti_j784s4evm.cfg
@@ -20,6 +20,6 @@ if { ![info exists SOC] } {
 	set SOC j784s4
 }
 
-source [find target/ti_k3.cfg]
+source [find target/ti/k3.cfg]
 
 adapter speed 2500
diff --git a/tcl/board/ti_msp432_launchpad.cfg b/tcl/board/ti_msp432_launchpad.cfg
index 4832b837b..455d5a362 100644
--- a/tcl/board/ti_msp432_launchpad.cfg
+++ b/tcl/board/ti_msp432_launchpad.cfg
@@ -6,4 +6,4 @@
 source [find interface/xds110.cfg]
 adapter speed 10000
 transport select swd
-source [find target/ti_msp432.cfg]
+source [find target/ti/msp432.cfg]
diff --git a/tcl/board/ti_mspm0_launchpad.cfg b/tcl/board/ti_mspm0_launchpad.cfg
index 132fdc2a3..30632f2b5 100644
--- a/tcl/board/ti_mspm0_launchpad.cfg
+++ b/tcl/board/ti_mspm0_launchpad.cfg
@@ -11,4 +11,4 @@
 
 source [find interface/xds110.cfg]
 adapter speed 10000
-source [find target/ti_mspm0.cfg]
+source [find target/ti/mspm0.cfg]
diff --git a/tcl/board/ti_pandaboard.cfg b/tcl/board/ti_pandaboard.cfg
index 45092e067..7e15f07bd 100644
--- a/tcl/board/ti_pandaboard.cfg
+++ b/tcl/board/ti_pandaboard.cfg
@@ -2,6 +2,6 @@
 
 jtag_rclk 6000
 
-source [find target/omap4430.cfg]
+source [find target/ti/omap4430.cfg]
 
 reset_config trst_only
diff --git a/tcl/board/ti_pandaboard_es.cfg b/tcl/board/ti_pandaboard_es.cfg
index f83735844..cd8a2f80b 100644
--- a/tcl/board/ti_pandaboard_es.cfg
+++ b/tcl/board/ti_pandaboard_es.cfg
@@ -2,6 +2,6 @@
 
 jtag_rclk 6000
 
-source [find target/omap4460.cfg]
+source [find target/ti/omap4460.cfg]
 
 reset_config trst_only
diff --git a/tcl/board/ti_tmdx570ls20susb.cfg b/tcl/board/ti_tmdx570ls20susb.cfg
index 9c5ef74ea..ccf649d8f 100644
--- a/tcl/board/ti_tmdx570ls20susb.cfg
+++ b/tcl/board/ti_tmdx570ls20susb.cfg
@@ -8,7 +8,7 @@
 source [find interface/ftdi/xds100v2.cfg]
 
 # Processor is TMS570LS20216
-source [find target/ti_tms570ls20xxx.cfg]
+source [find target/ti/tms570ls20xxx.cfg]
 
 reset_config trst_only
 
diff --git a/tcl/board/ti_tmdx570ls31usb.cfg b/tcl/board/ti_tmdx570ls31usb.cfg
index 324f003d3..b2d5d8119 100644
--- a/tcl/board/ti_tmdx570ls31usb.cfg
+++ b/tcl/board/ti_tmdx570ls31usb.cfg
@@ -3,6 +3,6 @@
 adapter speed 1500
 
 source [find interface/ftdi/xds100v2.cfg]
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]
 
 reset_config trst_only
diff --git a/tcl/target/am335x.cfg b/tcl/target/ti/am335x.cfg
similarity index 97%
rename from tcl/target/am335x.cfg
rename to tcl/target/ti/am335x.cfg
index 208ebf561..9388f76fb 100644
--- a/tcl/target/am335x.cfg
+++ b/tcl/target/ti/am335x.cfg
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
@@ -84,7 +84,7 @@ $_TARGETNAME configure -work-area-phys 0x40300000 -work-area-size 0x4000
 
 # when putting the target into 'reset halt', we need to disable the watchdog as
 # it would otherwise trigger while we're in JTAG
-# FIXME: unify with target/am437x.cfg
+# FIXME: unify with target/ti/am437x.cfg
 source [find mem_helper.tcl]
 set  WDT1_BASE_ADDR                  0x44e35000
 set  WDT1_W_PEND_WSPR                [expr       {$WDT1_BASE_ADDR     +  0x0034}]
diff --git a/tcl/target/am437x.cfg b/tcl/target/ti/am437x.cfg
similarity index 99%
rename from tcl/target/am437x.cfg
rename to tcl/target/ti/am437x.cfg
index 535092758..5470f164b 100644
--- a/tcl/target/am437x.cfg
+++ b/tcl/target/ti/am437x.cfg
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 source [find mem_helper.tcl]
 
 ###############################################################################
diff --git a/tcl/target/amdm37x.cfg b/tcl/target/ti/amdm37x.cfg
similarity index 99%
rename from tcl/target/amdm37x.cfg
rename to tcl/target/ti/amdm37x.cfg
index d9adae904..635d94c1c 100644
--- a/tcl/target/amdm37x.cfg
+++ b/tcl/target/ti/amdm37x.cfg
@@ -59,7 +59,7 @@ adapter speed 10
 #  can be read about this module in sprugn4r in chapter 27:  "Debug and
 #  Emulation".  The module is used to route the JTAG chain to the various
 #  subsystems in the chip.
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # The TAP order should be described from the TDO connection in OpenOCD to the
 #  TDI pin.  The OpenOCD FAQ describes this in more detail:
diff --git a/tcl/target/ti-ar7.cfg b/tcl/target/ti/ar7.cfg
similarity index 100%
rename from tcl/target/ti-ar7.cfg
rename to tcl/target/ti/ar7.cfg
diff --git a/tcl/target/ti_calypso.cfg b/tcl/target/ti/calypso.cfg
similarity index 100%
rename from tcl/target/ti_calypso.cfg
rename to tcl/target/ti/calypso.cfg
diff --git a/tcl/target/ti_cc13x0.cfg b/tcl/target/ti/cc13x0.cfg
similarity index 84%
rename from tcl/target/ti_cc13x0.cfg
rename to tcl/target/ti/cc13x0.cfg
index f1c43a689..7f33edb80 100644
--- a/tcl/target/ti_cc13x0.cfg
+++ b/tcl/target/ti/cc13x0.cfg
@@ -10,4 +10,4 @@ set CHIPNAME cc13x0
 set JRC_TAPID 0x0B9BE02F
 set WORKAREASIZE 0x4000
 
-source [find target/ti_cc26x0.cfg]
+source [find target/ti/cc26x0.cfg]
diff --git a/tcl/target/ti_cc13x2.cfg b/tcl/target/ti/cc13x2.cfg
similarity index 84%
rename from tcl/target/ti_cc13x2.cfg
rename to tcl/target/ti/cc13x2.cfg
index c85081685..2dadb9ce0 100644
--- a/tcl/target/ti_cc13x2.cfg
+++ b/tcl/target/ti/cc13x2.cfg
@@ -10,4 +10,4 @@ set CHIPNAME cc13x2
 set JRC_TAPID 0x0BB4102F
 set WORKAREASIZE 0x7000
 
-source [find target/ti_cc26x0.cfg]
+source [find target/ti/cc26x0.cfg]
diff --git a/tcl/target/cc2538.cfg b/tcl/target/ti/cc2538.cfg
similarity index 94%
rename from tcl/target/cc2538.cfg
rename to tcl/target/ti/cc2538.cfg
index e4fb02ad4..f0fd34b05 100644
--- a/tcl/target/cc2538.cfg
+++ b/tcl/target/ti/cc2538.cfg
@@ -5,8 +5,8 @@
 
 adapter speed 100
 
-source [find target/icepick.cfg]
-source [find target/ti-cjtag.cfg]
+source [find target/ti/icepick.cfg]
+source [find target/ti/cjtag.cfg]
 
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
diff --git a/tcl/target/ti_cc26x0.cfg b/tcl/target/ti/cc26x0.cfg
similarity index 95%
rename from tcl/target/ti_cc26x0.cfg
rename to tcl/target/ti/cc26x0.cfg
index b9ccf3123..246c1fd97 100644
--- a/tcl/target/ti_cc26x0.cfg
+++ b/tcl/target/ti/cc26x0.cfg
@@ -6,8 +6,8 @@
 # http://www.ti.com
 #
 
-source [find target/icepick.cfg]
-source [find target/ti-cjtag.cfg]
+source [find target/ti/icepick.cfg]
+source [find target/ti/cjtag.cfg]
 
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
diff --git a/tcl/target/ti_cc26x2.cfg b/tcl/target/ti/cc26x2.cfg
similarity index 84%
rename from tcl/target/ti_cc26x2.cfg
rename to tcl/target/ti/cc26x2.cfg
index 62c91c339..14b586921 100644
--- a/tcl/target/ti_cc26x2.cfg
+++ b/tcl/target/ti/cc26x2.cfg
@@ -10,4 +10,4 @@ set CHIPNAME cc26x2
 set JRC_TAPID 0x0BB4102F
 set WORKAREASIZE 0x7000
 
-source [find target/ti_cc26x0.cfg]
+source [find target/ti/cc26x0.cfg]
diff --git a/tcl/target/ti_cc26x2x7.cfg b/tcl/target/ti/cc26x2x7.cfg
similarity index 84%
rename from tcl/target/ti_cc26x2x7.cfg
rename to tcl/target/ti/cc26x2x7.cfg
index 91c1a8059..80ecdd450 100644
--- a/tcl/target/ti_cc26x2x7.cfg
+++ b/tcl/target/ti/cc26x2x7.cfg
@@ -10,4 +10,4 @@ set CHIPNAME cc26x2x7
 set JRC_TAPID 0x1BB7702F
 set WORKAREASIZE 0x7000
 
-source [find target/ti_cc26x0.cfg]
+source [find target/ti/cc26x0.cfg]
diff --git a/tcl/target/ti_cc3220sf.cfg b/tcl/target/ti/cc3220sf.cfg
similarity index 93%
rename from tcl/target/ti_cc3220sf.cfg
rename to tcl/target/ti/cc3220sf.cfg
index cf4336376..7b242ab8a 100644
--- a/tcl/target/ti_cc3220sf.cfg
+++ b/tcl/target/ti/cc3220sf.cfg
@@ -7,8 +7,8 @@
 #
 
 source [find target/swj-dp.tcl]
-source [find target/icepick.cfg]
-source [find target/ti_cc32xx.cfg]
+source [find target/ti/icepick.cfg]
+source [find target/ti/cc32xx.cfg]
 
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME cc3220sf 0 0 0 0 $_TARGETNAME
diff --git a/tcl/target/ti_cc32xx.cfg b/tcl/target/ti/cc32xx.cfg
similarity index 97%
rename from tcl/target/ti_cc32xx.cfg
rename to tcl/target/ti/cc32xx.cfg
index 9eb03eb2f..d081360bd 100644
--- a/tcl/target/ti_cc32xx.cfg
+++ b/tcl/target/ti/cc32xx.cfg
@@ -8,7 +8,7 @@
 #
 
 source [find target/swj-dp.tcl]
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
diff --git a/tcl/target/ti-cjtag.cfg b/tcl/target/ti/cjtag.cfg
similarity index 100%
rename from tcl/target/ti-cjtag.cfg
rename to tcl/target/ti/cjtag.cfg
diff --git a/tcl/target/davinci.cfg b/tcl/target/ti/davinci.cfg
similarity index 100%
rename from tcl/target/davinci.cfg
rename to tcl/target/ti/davinci.cfg
diff --git a/tcl/target/ti_dm355.cfg b/tcl/target/ti/dm355.cfg
similarity index 97%
rename from tcl/target/ti_dm355.cfg
rename to tcl/target/ti/dm355.cfg
index 42923733e..198d1eb50 100644
--- a/tcl/target/ti_dm355.cfg
+++ b/tcl/target/ti/dm355.cfg
@@ -17,7 +17,7 @@ set EMU01 "-disable"
 # needing any ICEpick interaction.
 #set EMU01 "-enable"
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 #
 # Also note: when running without RTCK before the PLLs are set up, you
@@ -80,7 +80,7 @@ dict set dm355 uart0		0x01c20000
 dict set dm355 uart1		0x01c20400
 dict set dm355 uart2		0x01e06000
 
-source [find target/davinci.cfg]
+source [find target/ti/davinci.cfg]
 
 ################
 # GDB target: the ARM, using SRAM1 for scratch.  SRAM0 (also 16K)
diff --git a/tcl/target/ti_dm365.cfg b/tcl/target/ti/dm365.cfg
similarity index 97%
rename from tcl/target/ti_dm365.cfg
rename to tcl/target/ti/dm365.cfg
index e19efd7ee..8f4510e3b 100644
--- a/tcl/target/ti_dm365.cfg
+++ b/tcl/target/ti/dm365.cfg
@@ -17,7 +17,7 @@ set EMU01 "-disable"
 # needing any ICEpick interaction.
 #set EMU01 "-enable"
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # Subsidiary TAP: ARM ETB11, with scan chain for 4K of ETM trace buffer
 if { [info exists ETB_TAPID] } {
@@ -72,7 +72,7 @@ dict set dm365 a_emif_cs1	0x04000000
 dict set dm365 ddr_emif		0x20000000
 dict set dm365 ddr		0x80000000
 
-source [find target/davinci.cfg]
+source [find target/ti/davinci.cfg]
 
 ################
 # GDB target: the ARM, using SRAM1 for scratch.  SRAM0 (also 16K)
diff --git a/tcl/target/ti_dm6446.cfg b/tcl/target/ti/dm6446.cfg
similarity index 98%
rename from tcl/target/ti_dm6446.cfg
rename to tcl/target/ti/dm6446.cfg
index 8938234c3..23218c4ab 100644
--- a/tcl/target/ti_dm6446.cfg
+++ b/tcl/target/ti/dm6446.cfg
@@ -17,7 +17,7 @@ set EMU01 "-disable"
 # needing any ICEpick interaction.
 #set EMU01 "-enable"
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # Subsidiary TAP: unknown ... must enable via ICEpick
 jtag newtap $_CHIPNAME unknown -irlen 8 -disable
diff --git a/tcl/target/icepick.cfg b/tcl/target/ti/icepick.cfg
similarity index 100%
rename from tcl/target/icepick.cfg
rename to tcl/target/ti/icepick.cfg
diff --git a/tcl/target/ti_k3.cfg b/tcl/target/ti/k3.cfg
similarity index 100%
rename from tcl/target/ti_k3.cfg
rename to tcl/target/ti/k3.cfg
diff --git a/tcl/target/ti_msp432.cfg b/tcl/target/ti/msp432.cfg
similarity index 100%
rename from tcl/target/ti_msp432.cfg
rename to tcl/target/ti/msp432.cfg
diff --git a/tcl/target/ti_mspm0.cfg b/tcl/target/ti/mspm0.cfg
similarity index 100%
rename from tcl/target/ti_mspm0.cfg
rename to tcl/target/ti/mspm0.cfg
diff --git a/tcl/target/omap2420.cfg b/tcl/target/ti/omap2420.cfg
similarity index 100%
rename from tcl/target/omap2420.cfg
rename to tcl/target/ti/omap2420.cfg
diff --git a/tcl/target/omap3530.cfg b/tcl/target/ti/omap3530.cfg
similarity index 98%
rename from tcl/target/omap3530.cfg
rename to tcl/target/ti/omap3530.cfg
index c1921b437..5ae003b39 100644
--- a/tcl/target/omap3530.cfg
+++ b/tcl/target/ti/omap3530.cfg
@@ -11,7 +11,7 @@ if { [info exists CHIPNAME] } {
 }
 
 # ICEpick-C ... used to route Cortex, DSP, and more not shown here
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # Subsidiary TAP: C64x+ DSP ... must enable via ICEpick
 jtag newtap $_CHIPNAME dsp -irlen 38 -ircapture 0x25 -irmask 0x3f -disable
diff --git a/tcl/target/omap4430.cfg b/tcl/target/ti/omap4430.cfg
similarity index 98%
rename from tcl/target/omap4430.cfg
rename to tcl/target/ti/omap4430.cfg
index 4bc7fe1bf..f1b87f147 100644
--- a/tcl/target/omap4430.cfg
+++ b/tcl/target/ti/omap4430.cfg
@@ -12,7 +12,7 @@ if { [info exists CHIPNAME] } {
 # Although the OMAP4430 supposedly has an ICEpick-D, only the
 # ICEpick-C router commands seem to work.
 # See http://processors.wiki.ti.com/index.php/ICEPICK
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 
 #
diff --git a/tcl/target/omap4460.cfg b/tcl/target/ti/omap4460.cfg
similarity index 98%
rename from tcl/target/omap4460.cfg
rename to tcl/target/ti/omap4460.cfg
index 85ba96c51..b9e414061 100644
--- a/tcl/target/omap4460.cfg
+++ b/tcl/target/ti/omap4460.cfg
@@ -12,7 +12,7 @@ if { [info exists CHIPNAME] } {
 # Although the OMAP4430 supposedly has an ICEpick-D, only the
 # ICEpick-C router commands seem to work.
 # See http://processors.wiki.ti.com/index.php/ICEPICK
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 
 #
diff --git a/tcl/target/omap5912.cfg b/tcl/target/ti/omap5912.cfg
similarity index 100%
rename from tcl/target/omap5912.cfg
rename to tcl/target/ti/omap5912.cfg
diff --git a/tcl/target/omapl138.cfg b/tcl/target/ti/omapl138.cfg
similarity index 98%
rename from tcl/target/omapl138.cfg
rename to tcl/target/ti/omapl138.cfg
index 9d89429a8..166317f1d 100644
--- a/tcl/target/omapl138.cfg
+++ b/tcl/target/ti/omapl138.cfg
@@ -9,7 +9,7 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME omapl138
 }
 
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # Subsidiary TAP: ARM ETB11, with scan chain for 4K of ETM trace buffer
 if { [info exists ETB_TAPID] } {
diff --git a/tcl/target/ti_rm4x.cfg b/tcl/target/ti/rm4x.cfg
similarity index 56%
rename from tcl/target/ti_rm4x.cfg
rename to tcl/target/ti/rm4x.cfg
index 715aa5b70..9103d4462 100644
--- a/tcl/target/ti_rm4x.cfg
+++ b/tcl/target/ti/rm4x.cfg
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]
diff --git a/tcl/target/stellaris.cfg b/tcl/target/ti/stellaris.cfg
similarity index 100%
rename from tcl/target/stellaris.cfg
rename to tcl/target/ti/stellaris.cfg
diff --git a/tcl/target/ti_tms570.cfg b/tcl/target/ti/tms570.cfg
similarity index 97%
rename from tcl/target/ti_tms570.cfg
rename to tcl/target/ti/tms570.cfg
index 18e0d8294..3b0639b5d 100644
--- a/tcl/target/ti_tms570.cfg
+++ b/tcl/target/ti/tms570.cfg
@@ -15,7 +15,7 @@ if { [info exists ENDIAN] } {
 }
 
 # TMS570 has an ICEpick-C on which we need the router commands.
-source [find target/icepick.cfg]
+source [find target/ti/icepick.cfg]
 
 # Main DAP
 # DAP_TAPID should be set before source-ing this file
diff --git a/tcl/target/ti_tms570lc43xx.cfg b/tcl/target/ti/tms570lc43xx.cfg
similarity index 73%
rename from tcl/target/ti_tms570lc43xx.cfg
rename to tcl/target/ti/tms570lc43xx.cfg
index ffda989f9..677132a89 100644
--- a/tcl/target/ti_tms570lc43xx.cfg
+++ b/tcl/target/ti/tms570lc43xx.cfg
@@ -3,4 +3,4 @@
 set DAP_TAPID 0x0B95A02F
 set JRC_TAPID 0x0B95A02F
 
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]
diff --git a/tcl/target/ti_tms570ls1x.cfg b/tcl/target/ti/tms570ls1x.cfg
similarity index 82%
rename from tcl/target/ti_tms570ls1x.cfg
rename to tcl/target/ti/tms570ls1x.cfg
index 3c2577757..8eace9c52 100644
--- a/tcl/target/ti_tms570ls1x.cfg
+++ b/tcl/target/ti/tms570ls1x.cfg
@@ -5,4 +5,4 @@
 set DAP_TAPID 0x0B95502F
 set JRC_TAPID 0x0B95502F
 
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]
diff --git a/tcl/target/ti_tms570ls20xxx.cfg b/tcl/target/ti/tms570ls20xxx.cfg
similarity index 84%
rename from tcl/target/ti_tms570ls20xxx.cfg
rename to tcl/target/ti/tms570ls20xxx.cfg
index cc2bbd690..4581dbf30 100644
--- a/tcl/target/ti_tms570ls20xxx.cfg
+++ b/tcl/target/ti/tms570ls20xxx.cfg
@@ -5,4 +5,4 @@
 set DAP_TAPID 0x0B7B302F
 set JRC_TAPID 0x0B7B302F
 
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]
diff --git a/tcl/target/ti_tms570ls3137.cfg b/tcl/target/ti/tms570ls3137.cfg
similarity index 76%
rename from tcl/target/ti_tms570ls3137.cfg
rename to tcl/target/ti/tms570ls3137.cfg
index ebe2cfc65..2cbbde84f 100644
--- a/tcl/target/ti_tms570ls3137.cfg
+++ b/tcl/target/ti/tms570ls3137.cfg
@@ -4,4 +4,4 @@
 set DAP_TAPID 0x0B8A002F
 set JRC_TAPID 0x0B8A002F
 
-source [find target/ti_tms570.cfg]
+source [find target/ti/tms570.cfg]