diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96.h b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96.h
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96.h
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_api.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_api.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_api.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_urc_handler.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_urc_handler.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_urc_handler.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_urc_handler.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_wrapper.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_wrapper.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Quectel-BG96/cellular_bg96_wrapper.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-BG96/cellular_bg96_wrapper.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802.h b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802.h
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802.h
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_api.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_api.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_api.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_urc_handler.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_urc_handler.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_urc_handler.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_urc_handler.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_wrapper.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_wrapper.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-Sierra-Wireless-HL7802/cellular_hl7802_wrapper.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-HL7802/cellular_hl7802_wrapper.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4.h b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4.h
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4.h
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_api.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_api.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_api.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_urc_handler.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_urc_handler.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_urc_handler.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_urc_handler.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_wrapper.c b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_wrapper.c
similarity index 100%
rename from FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-Implementation-ublox-SARA-R4/cellular_r4_wrapper.c
rename to FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/FreeRTOS-Cellular-Interface-Reference-SARA-R4/cellular_r4_wrapper.c