diff --git a/addons/attach/data/ace_IRStrobe.p3d b/addons/attach/data/ace_IRStrobe.p3d
index 2be5cbd428..062878073c 100644
Binary files a/addons/attach/data/ace_IRStrobe.p3d and b/addons/attach/data/ace_IRStrobe.p3d differ
diff --git a/addons/dagr/data/DAGR.p3d b/addons/dagr/data/DAGR.p3d
index 7ebff00dcd..b5b64889d9 100644
Binary files a/addons/dagr/data/DAGR.p3d and b/addons/dagr/data/DAGR.p3d differ
diff --git a/addons/explosives/Data/ace_m57.p3d b/addons/explosives/Data/ace_m57.p3d
index 56cb44e937..3e4534b472 100644
Binary files a/addons/explosives/Data/ace_m57.p3d and b/addons/explosives/Data/ace_m57.p3d differ
diff --git a/addons/hearing/data/ace_earplugs.p3d b/addons/hearing/data/ace_earplugs.p3d
index 2e66c383a5..3bae59a619 100644
Binary files a/addons/hearing/data/ace_earplugs.p3d and b/addons/hearing/data/ace_earplugs.p3d differ
diff --git a/addons/logistics_uavbattery/CfgWeapons.hpp b/addons/logistics_uavbattery/CfgWeapons.hpp
index 923d2dd934..46120f7c3d 100644
--- a/addons/logistics_uavbattery/CfgWeapons.hpp
+++ b/addons/logistics_uavbattery/CfgWeapons.hpp
@@ -6,7 +6,7 @@ class CfgWeapons {
         scope = 2;
         displayName = CSTRING(Battery_Name);
         descriptionShort = CSTRING(Battery_Description);
-        model = QUOTE(PATHTOF(models\ace_battery.p3d));
+        model = QUOTE(PATHTOF(data\ace_battery.p3d));
         picture = QUOTE(PATHTOF(ui\UAV_battery_ca.paa));
         class ItemInfo: InventoryItem_Base_F {
             mass = 20;
diff --git a/addons/logistics_uavbattery/data/ace_battery.p3d b/addons/logistics_uavbattery/data/ace_battery.p3d
new file mode 100644
index 0000000000..18c0c99fad
Binary files /dev/null and b/addons/logistics_uavbattery/data/ace_battery.p3d differ
diff --git a/addons/logistics_uavbattery/models/battery.rvmat b/addons/logistics_uavbattery/data/battery.rvmat
similarity index 87%
rename from addons/logistics_uavbattery/models/battery.rvmat
rename to addons/logistics_uavbattery/data/battery.rvmat
index 36329ac896..91ba414cc3 100644
--- a/addons/logistics_uavbattery/models/battery.rvmat
+++ b/addons/logistics_uavbattery/data/battery.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 
 class Stage1 {
-	texture="z\ace\addons\logistics_uavbattery\models\battery_nohq.paa";
+	texture="z\ace\addons\logistics_uavbattery\data\battery_nohq.paa";
 	uvSource="tex";
 	class uvTransform	{
 		aside[]={1,0,0};
@@ -38,7 +38,7 @@ class Stage3 {
 	};
 };
 class Stage4 {
-	texture="z\ace\addons\logistics_uavbattery\models\default_as.paa";
+	texture="z\ace\addons\logistics_uavbattery\data\default_as.paa";
 	uvSource="tex";
 	class uvTransform {
 		aside[]={1,0,0};
@@ -48,7 +48,7 @@ class Stage4 {
 	};
 };
 class Stage5 {
-	texture="z\ace\addons\logistics_uavbattery\models\battery_smdi.paa";
+	texture="z\ace\addons\logistics_uavbattery\data\battery_smdi.paa";
 	uvSource="tex";
 	class uvTransform	{
 		aside[]={1,0,0};
diff --git a/addons/logistics_uavbattery/models/battery_co.paa b/addons/logistics_uavbattery/data/battery_co.paa
similarity index 100%
rename from addons/logistics_uavbattery/models/battery_co.paa
rename to addons/logistics_uavbattery/data/battery_co.paa
diff --git a/addons/logistics_uavbattery/models/battery_nohq.paa b/addons/logistics_uavbattery/data/battery_nohq.paa
similarity index 100%
rename from addons/logistics_uavbattery/models/battery_nohq.paa
rename to addons/logistics_uavbattery/data/battery_nohq.paa
diff --git a/addons/logistics_uavbattery/models/battery_smdi.paa b/addons/logistics_uavbattery/data/battery_smdi.paa
similarity index 100%
rename from addons/logistics_uavbattery/models/battery_smdi.paa
rename to addons/logistics_uavbattery/data/battery_smdi.paa
diff --git a/addons/logistics_uavbattery/models/default_as.paa b/addons/logistics_uavbattery/data/default_as.paa
similarity index 100%
rename from addons/logistics_uavbattery/models/default_as.paa
rename to addons/logistics_uavbattery/data/default_as.paa
diff --git a/addons/logistics_uavbattery/models/ace_battery.p3d b/addons/logistics_uavbattery/models/ace_battery.p3d
deleted file mode 100644
index b505fc162d..0000000000
Binary files a/addons/logistics_uavbattery/models/ace_battery.p3d and /dev/null differ
diff --git a/addons/maptools/data/ace_MapTools.p3d b/addons/maptools/data/ace_MapTools.p3d
index b44cb2b648..f0952c09fa 100644
Binary files a/addons/maptools/data/ace_MapTools.p3d and b/addons/maptools/data/ace_MapTools.p3d differ
diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp
index 36efb842d5..909b06bfc5 100644
--- a/addons/medical/CfgWeapons.hpp
+++ b/addons/medical/CfgWeapons.hpp
@@ -113,16 +113,16 @@ class CfgWeapons {
         };
     };
     class ACE_plasmaIV_500: ACE_plasmaIV {
-        displayName = CSTRING(Plasma_500);
-        model = QUOTE(PATHTOF(data\IVBag_plasma_500ml.p3d));
+        displayName = CSTRING(Plasma_IV_500);
+        model = QUOTE(PATHTOF(data\IVBag_500ml.p3d));
         hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_500ml_ca.paa)) };
         class ItemInfo: InventoryItem_Base_F {
             mass = 5;
         };
     };
     class ACE_plasmaIV_250: ACE_plasmaIV {
-        displayName = CSTRING(Plasma_250);
-        model = QUOTE(PATHTOF(data\IVBag_plasma_250ml.p3d));
+        displayName = CSTRING(Plasma_IV_250);
+        model = QUOTE(PATHTOF(data\IVBag_250ml.p3d));
         hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_250ml_ca.paa)) };
         class ItemInfo: InventoryItem_Base_F {
             mass = 2.5;
diff --git a/addons/medical/data/IVBag_1000ml.p3d b/addons/medical/data/IVBag_1000ml.p3d
index ea14e3e59a..ba3d6d7017 100644
Binary files a/addons/medical/data/IVBag_1000ml.p3d and b/addons/medical/data/IVBag_1000ml.p3d differ
diff --git a/addons/medical/data/IVBag_250ml.p3d b/addons/medical/data/IVBag_250ml.p3d
index e5b007fcc4..af8015737d 100644
Binary files a/addons/medical/data/IVBag_250ml.p3d and b/addons/medical/data/IVBag_250ml.p3d differ
diff --git a/addons/medical/data/IVBag_500ml.p3d b/addons/medical/data/IVBag_500ml.p3d
index a6a00b8250..2c6f0a9f88 100644
Binary files a/addons/medical/data/IVBag_500ml.p3d and b/addons/medical/data/IVBag_500ml.p3d differ
diff --git a/addons/medical/data/QuikClot.p3d b/addons/medical/data/QuikClot.p3d
index 3bc2e0b4ca..8c89e16784 100644
Binary files a/addons/medical/data/QuikClot.p3d and b/addons/medical/data/QuikClot.p3d differ