diff --git a/boards/arm/tiva/tm4c123g-launchpad/README.txt b/boards/arm/tiva/tm4c123g-launchpad/README.txt
index 7f31ba5b7a..341947ffef 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/README.txt
+++ b/boards/arm/tiva/tm4c123g-launchpad/README.txt
@@ -230,7 +230,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
 
   Building OpenOCD under Cygwin:
 
-    Refer to boards/olimex-lpc1766stk/README.txt
+    Refer to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt
 
   Installing OpenOCD in Linux:
 
@@ -258,7 +258,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
     I have been using the on-board In-Circuit Debug Interface (ICDI) interface.
     OpenOCD requires a configuration file.  I keep the one I used last here:
 
-      boards/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg
+      boards/arm/tiva/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg
 
     However, the "correct" configuration script to use with OpenOCD may
     change as the features of OpenOCD evolve.  So you should at least
@@ -276,7 +276,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
 
     - Possibly the value of OPENOCD_PATH and TARGET_PATH
     - It assumes that the correct script to use is the one at
-      boards/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg
+      boards/arm/tiva/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg
 
   Starting OpenOCD
 
@@ -285,8 +285,10 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
 
       oocd.sh $PWD
 
-    The relative path to the oocd.sh script is boards/tm4c123g-launchpad/tools.
-    You may want to add that path to you PATH variable.
+    The relative path to the oocd.sh script is:
+      boards/arm/tiva/tm4c123g-launchpad/tools.
+
+    You may want to add that path to your PATH variable.
 
     Note that OpenOCD needs to be run with administrator privileges in
     some environments (sudo).
@@ -333,12 +335,13 @@ LEDs
   The TM4C123G has a single RGB LED.  If CONFIG_ARCH_LEDS is defined, then
   support for the LaunchPad LEDs will be included in the build.  See:
 
-  - boards/tm4c123g-launchpad/include/board.h - Defines LED constants, types and
-    prototypes the LED interface functions.
+  - boards/arm/tiva/tm4c123g-launchpad/include/board.h - Defines LED
+    constants, types and prototypes the LED interface functions.
 
-  - boards/tm4c123g-launchpad/src/tm4c123g-launchpad.h - GPIO settings for the LEDs.
+  - boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h - GPIO
+    settings for the LEDs.
 
-  - boards/tm4c123g-launchpad/src/up_leds.c - LED control logic.
+  - boards/arm/tiva/tm4c123g-launchpad/src/up_leds.c - LED control logic.
 
   OFF:
   - OFF means that the OS is still initializing. Initialization is very fast so
@@ -497,8 +500,8 @@ TM4C123G LaunchPad Configuration Options
 
     CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
        stack. If defined, this symbol is the size of the interrupt
-        stack in bytes.  If not defined, the user task stacks will be
-      used during interrupt handling.
+       stack in bytes.  If not defined, the user task stacks will be
+       used during interrupt handling.
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
@@ -551,8 +554,8 @@ TM4C123G LaunchPad Configuration Options
 Configurations
 ==============
 
-Each TM4C123G LaunchPad configuration is maintained in a
-sub-directory and can be selected as follow:
+Each TM4C123G LaunchPad configuration is maintained in a sub-directory of
+boards/arm/tiva/tm4c123g-launchpad/configs/ and can be selected as follows:
 
     tools/configure.sh tm4c123g-launchpad:<subdir>
 
@@ -562,8 +565,8 @@ Where <subdir> is one of the following:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh.  The
     configuration enables the serial VCOM interfaces on UART0.  Support for
-    builtin applications is enabled, but in the base configuration no
-    builtin applications are selected.
+    builtin applications is enabled, but in the base configuration no builtin
+    applications are selected.
 
     NOTES:
 
diff --git a/boards/arm/tiva/tm4c123g-launchpad/include/board.h b/boards/arm/tiva/tm4c123g-launchpad/include/board.h
index 028f4e457f..9c4ad4a68e 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/include/board.h
+++ b/boards/arm/tiva/tm4c123g-launchpad/include/board.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * boards/tm4c123g-launchpad/include/board.h
+ * boards/arm/tiva/tm4c123g-launchpad/include/board.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs b/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
index bc167772b9..e121524e9b 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
+++ b/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/tm4c123g-launchpad/scripts/Make.defs
+# boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
 #
 #   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld b/boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld
index e37e6a799a..042a0d1a7a 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld
+++ b/boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld
+ * boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld
  *
  *   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/Makefile b/boards/arm/tiva/tm4c123g-launchpad/src/Makefile
index 96a67b6190..e23bba003d 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/Makefile
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/tm4c123g-launchpad/src/Makefile
+# boards/arm/tiva/tm4c123g-launchpad/src/Makefile
 #
 #   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index f474392fcb..9e23f845fc 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * boards/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+ * boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h
  *
  *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c
index 6bfc8b7725..069a5751c4 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * boards/tm4c123g-launchpad/tm4c_adc.c
+ * boards/arm/tiva/tm4c123g-launchpad/tm4c_adc.c
  *
  *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
index d5e555fee2..a817d221a7 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/tm4c123g-launchpad/src/tm4c_leds.c
+ * boards/arm/tiva/tm4c123g-launchpad/src/tm4c_leds.c
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
index d9986875e0..78697244e0 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * boards/tm4c123g-launchpad/src/tm4c_boot.c
+ * boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
  *
  *   Copyright (C) 2014, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
index 4e47c67755..2e49d919b4 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * boards/tm4c123g-launchpad/src/tm4c_ssi.c
+ * boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh b/boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh
index d17d175c4d..8b6434de0b 100755
--- a/boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh
+++ b/boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# See boards/tm4c123g-launchpad/README.txt for information about
+# See boards/arm/tiva/tm4c123g-launchpad/README.txt for information about
 # this file.
 
 TOPDIR=$1
@@ -28,7 +28,7 @@ TARGET_PATH="/usr/share/openocd/scripts"
 # OPENOCD_EXE=openocd.exe
 OPENOCD_EXE=openocd
 
-OPENOCD_CFG="${TOPDIR}/boards/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg"
+OPENOCD_CFG="${TOPDIR}/boards/arm/tiva/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg"
 OPENOCD_ARGS="-f ${OPENOCD_CFG} -s ${TARGET_PATH}"
 
 if [ "X$2" = "X-d" ]; then