diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.ccsproject b/Demo/MSP430X_MSP430F5438_CCS/.ccsproject
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.ccsproject
rename to Demo/MSP430X_MSP430F5438_CCS/.ccsproject
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild b/Demo/MSP430X_MSP430F5438_CCS/.cdtbuild
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
rename to Demo/MSP430X_MSP430F5438_CCS/.cdtbuild
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.cdtproject b/Demo/MSP430X_MSP430F5438_CCS/.cdtproject
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.cdtproject
rename to Demo/MSP430X_MSP430F5438_CCS/.cdtproject
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.cproject b/Demo/MSP430X_MSP430F5438_CCS/.cproject
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.cproject
rename to Demo/MSP430X_MSP430F5438_CCS/.cproject
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.project b/Demo/MSP430X_MSP430F5438_CCS/.project
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.project
rename to Demo/MSP430X_MSP430F5438_CCS/.project
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/Demo/MSP430X_MSP430F5438_CCS/.settings/org.eclipse.cdt.managedbuilder.core.prefs
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.settings/org.eclipse.cdt.managedbuilder.core.prefs
rename to Demo/MSP430X_MSP430F5438_CCS/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.settings/org.eclipse.ltk.core.refactoring.prefs b/Demo/MSP430X_MSP430F5438_CCS/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to Demo/MSP430X_MSP430F5438_CCS/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat b/Demo/MSP430X_MSP430F5438_CCS/CreateProjectDirectoryStructure.bat
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
rename to Demo/MSP430X_MSP430F5438_CCS/CreateProjectDirectoryStructure.bat
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/HAL_PMM.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_UCS.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_macros.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_macros.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/F5XX_6XX_Core_Lib/hal_macros.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/F5XX_6XX_Core_Lib/hal_macros.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/FreeRTOSConfig.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/FreeRTOSConfig.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/FreeRTOSConfig.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_board.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_board.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_board.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_board.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_board.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_board.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_board.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_board.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_buttons.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.h b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.h
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.h
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/MSP-EXP430F5438_HAL/hal_lcd_fonts.h
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/ParTest.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/ParTest.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/ParTest.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/ParTest.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/RegTest.asm
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RegTest.asm
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/RegTest.asm
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/RunTimeStatsConfig.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/RunTimeStatsConfig.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/RunTimeStatsConfig.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/main.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/main.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/printf-stdarg.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/printf-stdarg.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/printf-stdarg.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/printf-stdarg.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c b/Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/serial.c
rename to Demo/MSP430X_MSP430F5438_CCS/Demo_Source/serial.c
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/MSP430F5438A.ccxml b/Demo/MSP430X_MSP430F5438_CCS/MSP430F5438A.ccxml
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/MSP430F5438A.ccxml
rename to Demo/MSP430X_MSP430F5438_CCS/MSP430F5438A.ccxml
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/READ_ME_FIRST.txt b/Demo/MSP430X_MSP430F5438_CCS/READ_ME_FIRST.txt
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/READ_ME_FIRST.txt
rename to Demo/MSP430X_MSP430F5438_CCS/READ_ME_FIRST.txt
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd b/Demo/MSP430X_MSP430F5438_CCS/lnk_msp430f5438a.cmd
similarity index 100%
rename from Demo/MSP430X_MSP430F5438_CCS4/lnk_msp430f5438a.cmd
rename to Demo/MSP430X_MSP430F5438_CCS/lnk_msp430f5438a.cmd