diff --git a/GW/src/BCM/HMI_LAMP.c b/GW/src/Function_Layer/Lamp_FUNC/HMI_LAMP.c
similarity index 100%
rename from GW/src/BCM/HMI_LAMP.c
rename to GW/src/Function_Layer/Lamp_FUNC/HMI_LAMP.c
diff --git a/GW/src/BCM/HMI_LAMP.h b/GW/src/Function_Layer/Lamp_FUNC/HMI_LAMP.h
similarity index 100%
rename from GW/src/BCM/HMI_LAMP.h
rename to GW/src/Function_Layer/Lamp_FUNC/HMI_LAMP.h
diff --git a/GW/src/BCM/LAMP_CMD.c b/GW/src/Function_Layer/Lamp_FUNC/LAMP_CMD.c
similarity index 100%
rename from GW/src/BCM/LAMP_CMD.c
rename to GW/src/Function_Layer/Lamp_FUNC/LAMP_CMD.c
diff --git a/GW/src/BCM/LAMP_CMD.h b/GW/src/Function_Layer/Lamp_FUNC/LAMP_CMD.h
similarity index 100%
rename from GW/src/BCM/LAMP_CMD.h
rename to GW/src/Function_Layer/Lamp_FUNC/LAMP_CMD.h
diff --git a/GW/src/BCM/NO_BCM_SIG.c b/GW/src/Function_Layer/Lamp_FUNC/NO_BCM_SIG.c
similarity index 100%
rename from GW/src/BCM/NO_BCM_SIG.c
rename to GW/src/Function_Layer/Lamp_FUNC/NO_BCM_SIG.c
diff --git a/GW/src/BCM/NO_BCM_SIG.h b/GW/src/Function_Layer/Lamp_FUNC/NO_BCM_SIG.h
similarity index 100%
rename from GW/src/BCM/NO_BCM_SIG.h
rename to GW/src/Function_Layer/Lamp_FUNC/NO_BCM_SIG.h
diff --git a/GW/src/BCM/PWM.c b/GW/src/Function_Layer/Lamp_FUNC/PWM.c
similarity index 100%
rename from GW/src/BCM/PWM.c
rename to GW/src/Function_Layer/Lamp_FUNC/PWM.c
diff --git a/GW/src/BCM/PWM.h b/GW/src/Function_Layer/Lamp_FUNC/PWM.h
similarity index 100%
rename from GW/src/BCM/PWM.h
rename to GW/src/Function_Layer/Lamp_FUNC/PWM.h
diff --git a/GW/src/BCM/WIPER.c b/GW/src/Function_Layer/Lamp_FUNC/WIPER.c
similarity index 100%
rename from GW/src/BCM/WIPER.c
rename to GW/src/Function_Layer/Lamp_FUNC/WIPER.c
diff --git a/GW/src/BCM/WIPER.h b/GW/src/Function_Layer/Lamp_FUNC/WIPER.h
similarity index 100%
rename from GW/src/BCM/WIPER.h
rename to GW/src/Function_Layer/Lamp_FUNC/WIPER.h
diff --git a/GW/src/VCU/SW_VER.c b/GW/src/Function_Layer/SW_VER_FUNC/SW_VER.c
similarity index 100%
rename from GW/src/VCU/SW_VER.c
rename to GW/src/Function_Layer/SW_VER_FUNC/SW_VER.c
diff --git a/GW/src/VCU/SW_VER.h b/GW/src/Function_Layer/SW_VER_FUNC/SW_VER.h
similarity index 100%
rename from GW/src/VCU/SW_VER.h
rename to GW/src/Function_Layer/SW_VER_FUNC/SW_VER.h
diff --git a/GW/src/Vehicle_System_Mode_Layer/IGN/Ignition.c b/GW/src/IG_Layer/Ignition.c
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/IGN/Ignition.c
rename to GW/src/IG_Layer/Ignition.c
diff --git a/GW/src/Vehicle_System_Mode_Layer/IGN/Ignition.h b/GW/src/IG_Layer/Ignition.h
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/IGN/Ignition.h
rename to GW/src/IG_Layer/Ignition.h
diff --git a/GW/src/Vehicle_System_Mode_Layer/IGN/Ignition_off.c b/GW/src/IG_Layer/Ignition_off.c
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/IGN/Ignition_off.c
rename to GW/src/IG_Layer/Ignition_off.c
diff --git a/GW/src/Vehicle_System_Mode_Layer/IGN/Ignition_off.h b/GW/src/IG_Layer/Ignition_off.h
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/IGN/Ignition_off.h
rename to GW/src/IG_Layer/Ignition_off.h
diff --git a/GW/src/IDB_RCU/BREAK_Speed.c b/GW/src/Operation_Mode_Layer/IDB_RCU/BREAK_Speed.c
similarity index 100%
rename from GW/src/IDB_RCU/BREAK_Speed.c
rename to GW/src/Operation_Mode_Layer/IDB_RCU/BREAK_Speed.c
diff --git a/GW/src/IDB_RCU/BREAK_Speed.h b/GW/src/Operation_Mode_Layer/IDB_RCU/BREAK_Speed.h
similarity index 100%
rename from GW/src/IDB_RCU/BREAK_Speed.h
rename to GW/src/Operation_Mode_Layer/IDB_RCU/BREAK_Speed.h
diff --git a/GW/src/MCU/Cruise_Control.c b/GW/src/Operation_Mode_Layer/MCU/Cruise_Control.c
similarity index 100%
rename from GW/src/MCU/Cruise_Control.c
rename to GW/src/Operation_Mode_Layer/MCU/Cruise_Control.c
diff --git a/GW/src/MCU/Cruise_Control.h b/GW/src/Operation_Mode_Layer/MCU/Cruise_Control.h
similarity index 100%
rename from GW/src/MCU/Cruise_Control.h
rename to GW/src/Operation_Mode_Layer/MCU/Cruise_Control.h
diff --git a/GW/src/MCU/Low_SOC_mode.c b/GW/src/Operation_Mode_Layer/MCU/Low_SOC_mode.c
similarity index 100%
rename from GW/src/MCU/Low_SOC_mode.c
rename to GW/src/Operation_Mode_Layer/MCU/Low_SOC_mode.c
diff --git a/GW/src/MCU/Low_SOC_mode.h b/GW/src/Operation_Mode_Layer/MCU/Low_SOC_mode.h
similarity index 100%
rename from GW/src/MCU/Low_SOC_mode.h
rename to GW/src/Operation_Mode_Layer/MCU/Low_SOC_mode.h
diff --git a/GW/src/MCU/Motor_logic.c b/GW/src/Operation_Mode_Layer/MCU/Motor_logic.c
similarity index 100%
rename from GW/src/MCU/Motor_logic.c
rename to GW/src/Operation_Mode_Layer/MCU/Motor_logic.c
diff --git a/GW/src/MCU/Motor_logic.h b/GW/src/Operation_Mode_Layer/MCU/Motor_logic.h
similarity index 100%
rename from GW/src/MCU/Motor_logic.h
rename to GW/src/Operation_Mode_Layer/MCU/Motor_logic.h
diff --git a/GW/src/MCU/NO_MCU_SIG.c b/GW/src/Operation_Mode_Layer/MCU/NO_MCU_SIG.c
similarity index 100%
rename from GW/src/MCU/NO_MCU_SIG.c
rename to GW/src/Operation_Mode_Layer/MCU/NO_MCU_SIG.c
diff --git a/GW/src/MCU/NO_MCU_SIG.h b/GW/src/Operation_Mode_Layer/MCU/NO_MCU_SIG.h
similarity index 100%
rename from GW/src/MCU/NO_MCU_SIG.h
rename to GW/src/Operation_Mode_Layer/MCU/NO_MCU_SIG.h
diff --git a/GW/src/MCU/SPEED.c b/GW/src/Operation_Mode_Layer/MCU/SPEED.c
similarity index 100%
rename from GW/src/MCU/SPEED.c
rename to GW/src/Operation_Mode_Layer/MCU/SPEED.c
diff --git a/GW/src/MCU/SPEED.h b/GW/src/Operation_Mode_Layer/MCU/SPEED.h
similarity index 100%
rename from GW/src/MCU/SPEED.h
rename to GW/src/Operation_Mode_Layer/MCU/SPEED.h
diff --git a/GW/src/Motor_Dymics_Logic/Set_Motor_Parameter.c b/GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/Set_Motor_Parameter.c
similarity index 100%
rename from GW/src/Motor_Dymics_Logic/Set_Motor_Parameter.c
rename to GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/Set_Motor_Parameter.c
diff --git a/GW/src/Motor_Dymics_Logic/Set_Motor_Parameter.h b/GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/Set_Motor_Parameter.h
similarity index 100%
rename from GW/src/Motor_Dymics_Logic/Set_Motor_Parameter.h
rename to GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/Set_Motor_Parameter.h
diff --git a/GW/src/Motor_Dymics_Logic/rtwtypes.h b/GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/rtwtypes.h
similarity index 100%
rename from GW/src/Motor_Dymics_Logic/rtwtypes.h
rename to GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/rtwtypes.h
diff --git a/GW/src/Motor_Dymics_Logic/wheelSpd2.c b/GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/wheelSpd2.c
similarity index 100%
rename from GW/src/Motor_Dymics_Logic/wheelSpd2.c
rename to GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/wheelSpd2.c
diff --git a/GW/src/Motor_Dymics_Logic/wheelSpd2.h b/GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/wheelSpd2.h
similarity index 100%
rename from GW/src/Motor_Dymics_Logic/wheelSpd2.h
rename to GW/src/Operation_Mode_Layer/Motor_Dymics_Logic/wheelSpd2.h
diff --git a/GW/src/RWA/Angle_RateLimit.c b/GW/src/Operation_Mode_Layer/RWA/Angle_RateLimit.c
similarity index 100%
rename from GW/src/RWA/Angle_RateLimit.c
rename to GW/src/Operation_Mode_Layer/RWA/Angle_RateLimit.c
diff --git a/GW/src/RWA/Angle_RateLimit.h b/GW/src/Operation_Mode_Layer/RWA/Angle_RateLimit.h
similarity index 100%
rename from GW/src/RWA/Angle_RateLimit.h
rename to GW/src/Operation_Mode_Layer/RWA/Angle_RateLimit.h
diff --git a/GW/src/RWA/Angle_Speed.c b/GW/src/Operation_Mode_Layer/RWA/Angle_Speed.c
similarity index 100%
rename from GW/src/RWA/Angle_Speed.c
rename to GW/src/Operation_Mode_Layer/RWA/Angle_Speed.c
diff --git a/GW/src/RWA/Angle_Speed.h b/GW/src/Operation_Mode_Layer/RWA/Angle_Speed.h
similarity index 100%
rename from GW/src/RWA/Angle_Speed.h
rename to GW/src/Operation_Mode_Layer/RWA/Angle_Speed.h
diff --git a/GW/src/RWA/RateLimiter.c b/GW/src/Operation_Mode_Layer/RWA/RateLimiter.c
similarity index 100%
rename from GW/src/RWA/RateLimiter.c
rename to GW/src/Operation_Mode_Layer/RWA/RateLimiter.c
diff --git a/GW/src/RWA/RateLimiter.h b/GW/src/Operation_Mode_Layer/RWA/RateLimiter.h
similarity index 100%
rename from GW/src/RWA/RateLimiter.h
rename to GW/src/Operation_Mode_Layer/RWA/RateLimiter.h
diff --git a/GW/src/RWA/RateLimiter_private.h b/GW/src/Operation_Mode_Layer/RWA/RateLimiter_private.h
similarity index 100%
rename from GW/src/RWA/RateLimiter_private.h
rename to GW/src/Operation_Mode_Layer/RWA/RateLimiter_private.h
diff --git a/GW/src/RWA/RateLimiter_types.h b/GW/src/Operation_Mode_Layer/RWA/RateLimiter_types.h
similarity index 100%
rename from GW/src/RWA/RateLimiter_types.h
rename to GW/src/Operation_Mode_Layer/RWA/RateLimiter_types.h
diff --git a/GW/src/RWA/rtwtypes.h b/GW/src/Operation_Mode_Layer/RWA/rtwtypes.h
similarity index 100%
rename from GW/src/RWA/rtwtypes.h
rename to GW/src/Operation_Mode_Layer/RWA/rtwtypes.h
diff --git a/GW/src/BMS/BMS_SOC.c b/GW/src/Safety_Layer/BMS/BMS_SOC.c
similarity index 100%
rename from GW/src/BMS/BMS_SOC.c
rename to GW/src/Safety_Layer/BMS/BMS_SOC.c
diff --git a/GW/src/BMS/BMS_SOC.h b/GW/src/Safety_Layer/BMS/BMS_SOC.h
similarity index 100%
rename from GW/src/BMS/BMS_SOC.h
rename to GW/src/Safety_Layer/BMS/BMS_SOC.h
diff --git a/GW/src/BMS/CE_ON_CMD.c b/GW/src/Safety_Layer/BMS/CE_ON_CMD.c
similarity index 100%
rename from GW/src/BMS/CE_ON_CMD.c
rename to GW/src/Safety_Layer/BMS/CE_ON_CMD.c
diff --git a/GW/src/BMS/CE_ON_CMD.h b/GW/src/Safety_Layer/BMS/CE_ON_CMD.h
similarity index 100%
rename from GW/src/BMS/CE_ON_CMD.h
rename to GW/src/Safety_Layer/BMS/CE_ON_CMD.h
diff --git a/GW/src/BMS/Charging_Status.c b/GW/src/Safety_Layer/BMS/Charging_Status.c
similarity index 100%
rename from GW/src/BMS/Charging_Status.c
rename to GW/src/Safety_Layer/BMS/Charging_Status.c
diff --git a/GW/src/BMS/Charging_Status.h b/GW/src/Safety_Layer/BMS/Charging_Status.h
similarity index 100%
rename from GW/src/BMS/Charging_Status.h
rename to GW/src/Safety_Layer/BMS/Charging_Status.h
diff --git a/GW/src/CRC/ALV.c b/GW/src/Safety_Layer/CRC/ALV.c
similarity index 100%
rename from GW/src/CRC/ALV.c
rename to GW/src/Safety_Layer/CRC/ALV.c
diff --git a/GW/src/CRC/ALV.h b/GW/src/Safety_Layer/CRC/ALV.h
similarity index 100%
rename from GW/src/CRC/ALV.h
rename to GW/src/Safety_Layer/CRC/ALV.h
diff --git a/GW/src/CRC/CAN_CHECK.c b/GW/src/Safety_Layer/CRC/CAN_CHECK.c
similarity index 100%
rename from GW/src/CRC/CAN_CHECK.c
rename to GW/src/Safety_Layer/CRC/CAN_CHECK.c
diff --git a/GW/src/CRC/CAN_CHECK.h b/GW/src/Safety_Layer/CRC/CAN_CHECK.h
similarity index 100%
rename from GW/src/CRC/CAN_CHECK.h
rename to GW/src/Safety_Layer/CRC/CAN_CHECK.h
diff --git a/GW/src/CRC/CRC_UDM.c b/GW/src/Safety_Layer/CRC/CRC_UDM.c
similarity index 100%
rename from GW/src/CRC/CRC_UDM.c
rename to GW/src/Safety_Layer/CRC/CRC_UDM.c
diff --git a/GW/src/CRC/CRC_UDM.h b/GW/src/Safety_Layer/CRC/CRC_UDM.h
similarity index 100%
rename from GW/src/CRC/CRC_UDM.h
rename to GW/src/Safety_Layer/CRC/CRC_UDM.h
diff --git a/GW/src/CRC/CRC_UDM_4BIT.c b/GW/src/Safety_Layer/CRC/CRC_UDM_4BIT.c
similarity index 100%
rename from GW/src/CRC/CRC_UDM_4BIT.c
rename to GW/src/Safety_Layer/CRC/CRC_UDM_4BIT.c
diff --git a/GW/src/CRC/CRC_UDM_4BIT.h b/GW/src/Safety_Layer/CRC/CRC_UDM_4BIT.h
similarity index 100%
rename from GW/src/CRC/CRC_UDM_4BIT.h
rename to GW/src/Safety_Layer/CRC/CRC_UDM_4BIT.h
diff --git a/GW/src/Vehicle_System_Mode_Layer/EMERGENCY/Emergency.c b/GW/src/Safety_Layer/EMERGENCY/Emergency.c
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/EMERGENCY/Emergency.c
rename to GW/src/Safety_Layer/EMERGENCY/Emergency.c
diff --git a/GW/src/Vehicle_System_Mode_Layer/EMERGENCY/Emergency.h b/GW/src/Safety_Layer/EMERGENCY/Emergency.h
similarity index 100%
rename from GW/src/Vehicle_System_Mode_Layer/EMERGENCY/Emergency.h
rename to GW/src/Safety_Layer/EMERGENCY/Emergency.h