diff --git a/TO_MERGE/agm/Grenades/texHeaders.bin b/TO_MERGE/agm/Grenades/texHeaders.bin
deleted file mode 100644
index 718d6490fc..0000000000
Binary files a/TO_MERGE/agm/Grenades/texHeaders.bin and /dev/null differ
diff --git a/addons/grenades/$PBOPREFIX$ b/addons/grenades/$PBOPREFIX$
new file mode 100644
index 0000000000..f43501a506
--- /dev/null
+++ b/addons/grenades/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\grenades
\ No newline at end of file
diff --git a/TO_MERGE/agm/Grenades/AGM_M84.p3d b/addons/grenades/AGM_M84.p3d
similarity index 100%
rename from TO_MERGE/agm/Grenades/AGM_M84.p3d
rename to addons/grenades/AGM_M84.p3d
diff --git a/TO_MERGE/agm/Grenades/AGM_M84_thrown.p3d b/addons/grenades/AGM_M84_thrown.p3d
similarity index 100%
rename from TO_MERGE/agm/Grenades/AGM_M84_thrown.p3d
rename to addons/grenades/AGM_M84_thrown.p3d
diff --git a/TO_MERGE/agm/Grenades/UI/agm_m84_x_ca.paa b/addons/grenades/UI/agm_m84_x_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Grenades/UI/agm_m84_x_ca.paa
rename to addons/grenades/UI/agm_m84_x_ca.paa
diff --git a/TO_MERGE/agm/Grenades/clientInit.sqf b/addons/grenades/clientInit.sqf
similarity index 100%
rename from TO_MERGE/agm/Grenades/clientInit.sqf
rename to addons/grenades/clientInit.sqf
diff --git a/TO_MERGE/agm/Grenades/config.cpp b/addons/grenades/config.cpp
similarity index 100%
rename from TO_MERGE/agm/Grenades/config.cpp
rename to addons/grenades/config.cpp
diff --git a/TO_MERGE/agm/Grenades/data/agm_m84.rvmat b/addons/grenades/data/agm_m84.rvmat
similarity index 100%
rename from TO_MERGE/agm/Grenades/data/agm_m84.rvmat
rename to addons/grenades/data/agm_m84.rvmat
diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_co.paa b/addons/grenades/data/agm_m84_co.paa
similarity index 100%
rename from TO_MERGE/agm/Grenades/data/agm_m84_co.paa
rename to addons/grenades/data/agm_m84_co.paa
diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_nohq.paa b/addons/grenades/data/agm_m84_nohq.paa
similarity index 100%
rename from TO_MERGE/agm/Grenades/data/agm_m84_nohq.paa
rename to addons/grenades/data/agm_m84_nohq.paa
diff --git a/TO_MERGE/agm/Grenades/data/agm_m84_smdi.paa b/addons/grenades/data/agm_m84_smdi.paa
similarity index 100%
rename from TO_MERGE/agm/Grenades/data/agm_m84_smdi.paa
rename to addons/grenades/data/agm_m84_smdi.paa
diff --git a/TO_MERGE/agm/Grenades/functions/fn_flashbangEffect.sqf b/addons/grenades/functions/fn_flashbangEffect.sqf
similarity index 100%
rename from TO_MERGE/agm/Grenades/functions/fn_flashbangEffect.sqf
rename to addons/grenades/functions/fn_flashbangEffect.sqf
diff --git a/TO_MERGE/agm/Grenades/functions/fn_nextMode.sqf b/addons/grenades/functions/fn_nextMode.sqf
similarity index 100%
rename from TO_MERGE/agm/Grenades/functions/fn_nextMode.sqf
rename to addons/grenades/functions/fn_nextMode.sqf
diff --git a/TO_MERGE/agm/Grenades/functions/fn_throwGrenade.sqf b/addons/grenades/functions/fn_throwGrenade.sqf
similarity index 100%
rename from TO_MERGE/agm/Grenades/functions/fn_throwGrenade.sqf
rename to addons/grenades/functions/fn_throwGrenade.sqf
diff --git a/addons/grenades/script_component.hpp b/addons/grenades/script_component.hpp
new file mode 100644
index 0000000000..f7b11616be
--- /dev/null
+++ b/addons/grenades/script_component.hpp
@@ -0,0 +1,14 @@
+#define COMPONENT grenades
+#include "\z\ace\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+
+#ifdef DEBUG_ENABLED_COMMON
+    #define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_COMMON
+    #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON
+#endif
+
+#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/TO_MERGE/agm/Grenades/stringtable.xml b/addons/grenades/stringtable.xml
similarity index 100%
rename from TO_MERGE/agm/Grenades/stringtable.xml
rename to addons/grenades/stringtable.xml