diff --git a/CortexM0_DesignStart/contents/Module_1/Lecture_1_intro.pptx b/CortexM0_DesignStart/contents/Module 01_Introduction to Arm-based System-on-Chip Design/Lecture_1_intro.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_1/Lecture_1_intro.pptx
rename to CortexM0_DesignStart/contents/Module 01_Introduction to Arm-based System-on-Chip Design/Lecture_1_intro.pptx
diff --git a/CortexM0_DesignStart/contents/Module_2/Lecture_2_Cortex-M0_part1.pptx b/CortexM0_DesignStart/contents/Module 02_The Arm Cortex-M0 Processor Architecture: Part 1/Lecture_2_Cortex-M0_part1.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_2/Lecture_2_Cortex-M0_part1.pptx
rename to CortexM0_DesignStart/contents/Module 02_The Arm Cortex-M0 Processor Architecture: Part 1/Lecture_2_Cortex-M0_part1.pptx
diff --git a/CortexM0_DesignStart/contents/Module_3/Lecture_3_Cortex-M0_part2.pptx b/CortexM0_DesignStart/contents/Module 03_The Arm Cortex-M0 Processor Architecture: Part 2/Lecture_3_Cortex-M0_part2.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_3/Lecture_3_Cortex-M0_part2.pptx
rename to CortexM0_DesignStart/contents/Module 03_The Arm Cortex-M0 Processor Architecture: Part 2/Lecture_3_Cortex-M0_part2.pptx
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/IntroSoC_lab04.docx b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/IntroSoC_lab04.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/IntroSoC_lab04.docx
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/IntroSoC_lab04.docx
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/Intro_SOC_Getting_started.docx b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Intro_SOC_Getting_started.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/Intro_SOC_Getting_started.docx
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Intro_SOC_Getting_started.docx
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/Intro_SOC_Update_Bitstream_Guide.docx b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Intro_SOC_Update_Bitstream_Guide.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/Intro_SOC_Update_Bitstream_Guide.docx
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Intro_SOC_Update_Bitstream_Guide.docx
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/Update_Bitstream/update_bitstream.tcl b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Update_Bitstream/update_bitstream.tcl
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/Update_Bitstream/update_bitstream.tcl
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Update_Bitstream/update_bitstream.tcl
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/Update_Bitstream/update_bitstream_header.tcl b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Update_Bitstream/update_bitstream_header.tcl
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/Update_Bitstream/update_bitstream_header.tcl
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/Update_Bitstream/update_bitstream_header.tcl
diff --git a/CortexM0_DesignStart/contents/Module_4/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_4/Lecture_4_AHB-Lite.pptx b/CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lecture_4_AHB-Lite.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_4/Lecture_4_AHB-Lite.pptx
rename to CortexM0_DesignStart/contents/Module 04_AMBA 3 AHB-Lite Bus Architecture/Lecture_4_AHB-Lite.pptx
diff --git a/CortexM0_DesignStart/contents/Module_5/Lab/IntroSoC_lab05.docx b/CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/IntroSoC_lab05.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_5/Lab/IntroSoC_lab05.docx
rename to CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/IntroSoC_lab05.docx
diff --git a/CortexM0_DesignStart/contents/Module_5/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_5/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_5/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_5/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_5/Lecture_5_VGA.pptx b/CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lecture_5_VGA.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_5/Lecture_5_VGA.pptx
rename to CortexM0_DesignStart/contents/Module 05_AHB VGA Peripheral/Lecture_5_VGA.pptx
diff --git a/CortexM0_DesignStart/contents/Module_6/Lab/IntroSoC_lab06.docx b/CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/IntroSoC_lab06.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_6/Lab/IntroSoC_lab06.docx
rename to CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/IntroSoC_lab06.docx
diff --git a/CortexM0_DesignStart/contents/Module_6/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_6/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_6/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_6/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_6/Lecture_6_UART.pptx b/CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lecture_6_UART.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_6/Lecture_6_UART.pptx
rename to CortexM0_DesignStart/contents/Module 06_AHB UART Peripheral/Lecture_6_UART.pptx
diff --git a/CortexM0_DesignStart/contents/Module_7/Lab/IntroSoC_lab07.docx b/CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/IntroSoC_lab07.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_7/Lab/IntroSoC_lab07.docx
rename to CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/IntroSoC_lab07.docx
diff --git a/CortexM0_DesignStart/contents/Module_7/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_7/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_7/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_7/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_7/Lecture_7_Timer_GPIO_7seg.pptx b/CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lecture_7_Timer_GPIO_7seg.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_7/Lecture_7_Timer_GPIO_7seg.pptx
rename to CortexM0_DesignStart/contents/Module 07_Timer, GPIO and 7-Segment Peripherals/Lecture_7_Timer_GPIO_7seg.pptx
diff --git a/CortexM0_DesignStart/contents/Module_8/Lab/IntroSoC_lab08.docx b/CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/IntroSoC_lab08.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_8/Lab/IntroSoC_lab08.docx
rename to CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/IntroSoC_lab08.docx
diff --git a/CortexM0_DesignStart/contents/Module_8/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_8/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_8/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_8/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_8/Lecture_8_Interrupts.pptx b/CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lecture_8_Interrupts.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_8/Lecture_8_Interrupts.pptx
rename to CortexM0_DesignStart/contents/Module 08_Interrupt Mechanisms/Lecture_8_Interrupts.pptx
diff --git a/CortexM0_DesignStart/contents/Module_9/Lab/IntroSoC_lab09.docx b/CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/IntroSoC_lab09.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_9/Lab/IntroSoC_lab09.docx
rename to CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/IntroSoC_lab09.docx
diff --git a/CortexM0_DesignStart/contents/Module_9/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_9/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_9/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_9/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_9/Lecture_9_using_C.pptx b/CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lecture_9_using_C.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_9/Lecture_9_using_C.pptx
rename to CortexM0_DesignStart/contents/Module 09_Programming an SoC using C Language/Lecture_9_using_C.pptx
diff --git a/CortexM0_DesignStart/contents/Module_10/Lab/IntroSoC_lab10.docx b/CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/IntroSoC_lab10.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_10/Lab/IntroSoC_lab10.docx
rename to CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/IntroSoC_lab10.docx
diff --git a/CortexM0_DesignStart/contents/Module_10/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_10/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_10/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_10/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_10/Lecture_10_CMSIS.pptx b/CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lecture_10_CMSIS.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_10/Lecture_10_CMSIS.pptx
rename to CortexM0_DesignStart/contents/Module 10_Arm CMSIS and Software Drivers/Lecture_10_CMSIS.pptx
diff --git a/CortexM0_DesignStart/contents/Module_11/Lab/IntroSoC_lab11.docx b/CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/IntroSoC_lab11.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_11/Lab/IntroSoC_lab11.docx
rename to CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/IntroSoC_lab11.docx
diff --git a/CortexM0_DesignStart/contents/Module_11/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_11/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_11/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_11/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lab/lab_files.zip
diff --git a/CortexM0_DesignStart/contents/Module_11/Lecture_11_API_Snake.pptx b/CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lecture_11_API_Snake.pptx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_11/Lecture_11_API_Snake.pptx
rename to CortexM0_DesignStart/contents/Module 11_Application Programming Interface and Final Application/Lecture_11_API_Snake.pptx
diff --git a/CortexM0_DesignStart/contents/Module_12/Lab/IntroSoC_lab12.docx b/CortexM0_DesignStart/contents/Module 12_Final Project/Lab/IntroSoC_lab12.docx
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_12/Lab/IntroSoC_lab12.docx
rename to CortexM0_DesignStart/contents/Module 12_Final Project/Lab/IntroSoC_lab12.docx
diff --git a/CortexM0_DesignStart/contents/Module_12/Lab/Lab_Code_Solution.zip b/CortexM0_DesignStart/contents/Module 12_Final Project/Lab/Lab_Code_Solution.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_12/Lab/Lab_Code_Solution.zip
rename to CortexM0_DesignStart/contents/Module 12_Final Project/Lab/Lab_Code_Solution.zip
diff --git a/CortexM0_DesignStart/contents/Module_12/Lab/lab_files.zip b/CortexM0_DesignStart/contents/Module 12_Final Project/Lab/lab_files.zip
similarity index 100%
rename from CortexM0_DesignStart/contents/Module_12/Lab/lab_files.zip
rename to CortexM0_DesignStart/contents/Module 12_Final Project/Lab/lab_files.zip