diff --git a/TO_MERGE/agm/Overheating/UI/spare_barrel_ca.paa b/addons/overheating/UI/spare_barrel_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Overheating/UI/spare_barrel_ca.paa
rename to addons/overheating/UI/spare_barrel_ca.paa
diff --git a/TO_MERGE/agm/Overheating/UI/temp_ca.paa b/addons/overheating/UI/temp_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Overheating/UI/temp_ca.paa
rename to addons/overheating/UI/temp_ca.paa
diff --git a/TO_MERGE/agm/Overheating/config.cpp b/addons/overheating/config.cpp
similarity index 100%
rename from TO_MERGE/agm/Overheating/config.cpp
rename to addons/overheating/config.cpp
diff --git a/TO_MERGE/agm/Overheating/functions/fn_checkTemperature.sqf b/addons/overheating/functions/fn_checkTemperature.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_checkTemperature.sqf
rename to addons/overheating/functions/fn_checkTemperature.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_clearJam.sqf b/addons/overheating/functions/fn_clearJam.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_clearJam.sqf
rename to addons/overheating/functions/fn_clearJam.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_cooldown.sqf b/addons/overheating/functions/fn_cooldown.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_cooldown.sqf
rename to addons/overheating/functions/fn_cooldown.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_jamWeapon.sqf b/addons/overheating/functions/fn_jamWeapon.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_jamWeapon.sqf
rename to addons/overheating/functions/fn_jamWeapon.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_overheat.sqf b/addons/overheating/functions/fn_overheat.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_overheat.sqf
rename to addons/overheating/functions/fn_overheat.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_swapBarrel.sqf b/addons/overheating/functions/fn_swapBarrel.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_swapBarrel.sqf
rename to addons/overheating/functions/fn_swapBarrel.sqf
diff --git a/TO_MERGE/agm/Overheating/functions/fn_swapBarrelCallback.sqf b/addons/overheating/functions/fn_swapBarrelCallback.sqf
similarity index 100%
rename from TO_MERGE/agm/Overheating/functions/fn_swapBarrelCallback.sqf
rename to addons/overheating/functions/fn_swapBarrelCallback.sqf
diff --git a/TO_MERGE/agm/Overheating/sounds/barrelswap.ogg b/addons/overheating/sounds/barrelswap.ogg
similarity index 100%
rename from TO_MERGE/agm/Overheating/sounds/barrelswap.ogg
rename to addons/overheating/sounds/barrelswap.ogg
diff --git a/TO_MERGE/agm/Overheating/stringtable.xml b/addons/overheating/stringtable.xml
similarity index 100%
rename from TO_MERGE/agm/Overheating/stringtable.xml
rename to addons/overheating/stringtable.xml