diff --git a/addons/common/FixPickup.hpp b/addons/common/CfgActions.hpp
similarity index 61%
rename from addons/common/FixPickup.hpp
rename to addons/common/CfgActions.hpp
index 79ddf77026..8e556b38e3 100644
--- a/addons/common/FixPickup.hpp
+++ b/addons/common/CfgActions.hpp
@@ -1,5 +1,6 @@
 
 class CfgActions {
+    // fixes pick up action on mine detectors, because all ACE items are of that simulationClass and BI doesn't seem to care
     class None;
     class TakeWeapon: None {
         show = 0;
diff --git a/addons/common/CfgMoves.hpp b/addons/common/CfgMoves.hpp
new file mode 100644
index 0000000000..b0df9a4466
--- /dev/null
+++ b/addons/common/CfgMoves.hpp
@@ -0,0 +1,76 @@
+
+class CfgMovesBasic {
+    class Default;
+    class Actions {
+        // fixes grab animation with equipped pistol
+        class NoActions;
+        class PistolStandActions: NoActions {
+            grabDrag = "AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2";
+        };
+        class LauncherKneelActions: NoActions {
+            grabDrag = "AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2";
+        };
+        class CivilStandActions: NoActions {
+            grabDrag = "AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2";
+        };
+    };
+};
+
+class CfgMovesMaleSdr: CfgMovesBasic {
+    class AgonyBase;
+    class AgonyBaseRfl;
+    class StandBase;
+    class HealBase;
+
+    class States {
+        // fixes being able to reload in some animations, can't remember now what exactly
+        class AinjPfalMstpSnonWnonDnon_carried_Down: AgonyBase {
+            canReload = 0;
+        };
+        class AinjPfalMstpSnonWnonDnon_carried_Up: AgonyBase {
+            canReload = 0;
+        };
+        class AinjPfalMstpSnonWrflDnon_carried_Down: AgonyBase {
+            canReload = 0;
+        };
+        class AinjPfalMstpSnonWrflDnon_carried_Up: AgonyBaseRfl {
+            canReload = 0;
+        };
+
+        class AmovPpneMstpSnonWnonDnon_injured;
+        class AinjPpneMstpSnonWnonDnon: AmovPpneMstpSnonWnonDnon_injured {
+            canReload = 0;
+        };
+        class AmovPpneMstpSrasWrflDnon_injured;
+        class AinjPpneMstpSnonWrflDnon: AmovPpneMstpSrasWrflDnon_injured {
+            canReload = 0;
+        };
+
+        // mark as on ladder animation
+        class LadderCivilStatic: StandBase {
+            ACE_isLadder = 1;
+        };
+
+        // dunno, important
+        class AmovPercMstpSnonWnonDnon_AcinPknlMwlkSnonWnonDb_1;
+        class AcinPknlMstpSnonWnonDnon: AmovPercMstpSnonWnonDnon_AcinPknlMwlkSnonWnonDb_1 {
+            enableDirectControl = 1;
+        };
+        class AcinPknlMwlkSnonWnonDb: AmovPercMstpSnonWnonDnon_AcinPknlMwlkSnonWnonDb_1 {
+            enableDirectControl = 1;
+        };
+
+        // fix falling back to unconsciousness animation and disable rotating in that state
+        class Unconscious: Default {
+            ConnectTo[] = {};
+            head = "headNo";
+            forceAim = 1;
+            static = 1;
+        };
+
+        // idk. Flummi?
+        class AinvPknlMstpSnonWnonDnon_medic0: HealBase {
+            variantsPlayer[] = {};
+        };
+    };
+};
diff --git a/addons/common/NoVoice.hpp b/addons/common/CfgVoice.hpp
similarity index 99%
rename from addons/common/NoVoice.hpp
rename to addons/common/CfgVoice.hpp
index a34e30c08e..9c53338e6e 100644
--- a/addons/common/NoVoice.hpp
+++ b/addons/common/CfgVoice.hpp
@@ -218,6 +218,7 @@ class CfgVoice {
         displayName = "$STR_ACE_Common_NoVoice";
     };
 };
+
 class CfgVoiceTypes {
     class ACE_NoVoice {
         name = "$STR_ACE_Common_NoVoice";
diff --git a/addons/common/FixAnimations.hpp b/addons/common/FixAnimations.hpp
deleted file mode 100644
index d389391ba1..0000000000
--- a/addons/common/FixAnimations.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-class CfgMovesBasic;
-class CfgMovesMaleSdr: CfgMovesBasic {
-    class AgonyBase;
-    class AgonyBaseRfl;
-    class StandBase;
-
-    class States {
-        class AinjPfalMstpSnonWnonDnon_carried_Down: AgonyBase {
-            canReload = 0;
-        };
-        class AinjPfalMstpSnonWnonDnon_carried_Up: AgonyBase {
-            canReload = 0;
-        };
-        class AinjPfalMstpSnonWrflDnon_carried_Down: AgonyBase {
-            canReload = 0;
-        };
-        class AinjPfalMstpSnonWrflDnon_carried_Up: AgonyBaseRfl {
-            canReload = 0;
-        };
-
-        class AmovPpneMstpSnonWnonDnon_injured;
-        class AinjPpneMstpSnonWnonDnon: AmovPpneMstpSnonWnonDnon_injured {
-            canReload = 0;
-        };
-        class AmovPpneMstpSrasWrflDnon_injured;
-        class AinjPpneMstpSnonWrflDnon: AmovPpneMstpSrasWrflDnon_injured {
-            canReload = 0;
-        };
-
-        class LadderCivilStatic: StandBase {
-            ACE_isLadder = 1;
-        };
-    };
-};
diff --git a/addons/common/config.cpp b/addons/common/config.cpp
index 8081a05637..82e52a5cb5 100644
--- a/addons/common/config.cpp
+++ b/addons/common/config.cpp
@@ -13,11 +13,16 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
+
 #include "CfgSounds.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgMagazines.hpp"
 
+#include "CfgActions.hpp"
+#include "CfgMoves.hpp"
+#include "CfgVoice.hpp"
+
 class ACE_Rsc_Display_Base {
     idd = -1;
     type = 0;
@@ -126,9 +131,6 @@ class ACE_Settings {
 #include <ProgressScreen.hpp>
 #include <HintConfig.hpp>
 #include <RscInfoType.hpp>
-#include <FixPickup.hpp>
-#include <FixAnimations.hpp>
-#include <NoVoice.hpp>
 
 class CfgUIGrids {
     class IGUI {