diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp
index cef70dd8a..76164cc3c 100644
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -1856,169 +1856,9 @@ class CfgMagazines {
 	#include "CfgMagazines\Food.hpp"
 	#include "CfgMagazines\DZE\Food.hpp"
 
-	class FoodDrink;
-	class ItemWaterbottle: FoodDrink
-	{
-		scope = 2;
-		refillable = 1;
-		sfx = "drink";
-		wateroz = 10;
-		displayName = "$STR_EQUIP_NAME_12";
-		model = "\dayz_equip\models\waterbottle_gear.p3d";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
-		descriptionShort = "$STR_EQUIP_DESC_12";
-	};
-	class ItemWaterbottleUnfilled: CA_Magazine
-	{
-		scope = 2;
-		count = 1;
-		type = 256;
-		displayName = "$STR_EQUIP_NAME_13";
-		model = "\dayz_equip\models\waterbottle_gear.p3d";
-		picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
-		descriptionShort = "$STR_EQUIP_DESC_13";
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-
-	class ItemWaterbottleBoiled : ItemWaterbottle {
-		displayName = $STR_ITEMWATERBOTTLEBOILED_CODE_NAME;
-		descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC;
-	};
-
-	class ItemWaterbottle1oz : ItemWaterbottle {
-		displayName = "Water Bottle (1oz)";
-		descriptionShort = "Watter Bottle with 1oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle1oz_ca.paa";
-		wateroz = 1;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle2oz : ItemWaterbottle {
-		displayName = "Water Bottle (2oz)";
-		descriptionShort = "Watter Bottle with 2oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle2oz_ca.paa";
-		wateroz = 2;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle3oz : ItemWaterbottle {
-		displayName = "Water Bottle (3oz)";
-		descriptionShort = "Watter Bottle with 3oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle3oz_ca.paa";
-		wateroz = 3;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle4oz : ItemWaterbottle {
-		displayName = "Water Bottle (4oz)";
-		descriptionShort = "Watter Bottle with 4oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle4oz_ca.paa";
-		wateroz = 4;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle5oz : ItemWaterbottle {
-		displayName = "Water Bottle (5oz)";
-		descriptionShort = "Watter Bottle with 5oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle5oz_ca.paa";
-		wateroz = 5;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle6oz : ItemWaterbottle {
-		displayName = "Water Bottle (6oz)";
-		descriptionShort = "Watter Bottle with 6oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle6oz_ca.paa";
-		wateroz = 6;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle7oz : ItemWaterbottle {
-		displayName = "Water Bottle (7oz)";
-		descriptionShort = "Watter Bottle with 7oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle7oz_ca.paa";
-		wateroz = 7;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle8oz : ItemWaterbottle {
-		displayName = "Water Bottle (8oz)";
-		descriptionShort = "Watter Bottle with 8oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle8oz_ca.paa";
-		wateroz = 8;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-	class ItemWaterbottle9oz : ItemWaterbottle {
-		displayName = "Water Bottle (9oz)";
-		descriptionShort = "Watter Bottle with 9oz of water";
-		picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle9oz_ca.paa";
-		wateroz = 9;
-		class ItemActions
-		{
-			class Fill
-			{
-				text = "$STR_ACTIONS_FILL_W";
-				script = "spawn player_fillWater;";
-			};
-		};
-	};
-
+	// Waterbottle
+	#include "CfgMagazines\ItemWaterbottle.hpp"
+	#include "CfgMagazines\DZE\ItemWaterbottle.hpp"
 
 	#include "CfgMagazines\MeleeSwing.hpp"
 
diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
new file mode 100644
index 000000000..54e90d91f
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
@@ -0,0 +1,108 @@
+class ItemWaterbottle1oz : ItemWaterbottle {
+	displayName = "Water Bottle (1oz)";
+	descriptionShort = "Watter Bottle with 1oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle1oz_ca.paa";
+	wateroz = 1;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle2oz : ItemWaterbottle {
+	displayName = "Water Bottle (2oz)";
+	descriptionShort = "Watter Bottle with 2oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle2oz_ca.paa";
+	wateroz = 2;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle3oz : ItemWaterbottle {
+	displayName = "Water Bottle (3oz)";
+	descriptionShort = "Watter Bottle with 3oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle3oz_ca.paa";
+	wateroz = 3;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle4oz : ItemWaterbottle {
+	displayName = "Water Bottle (4oz)";
+	descriptionShort = "Watter Bottle with 4oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle4oz_ca.paa";
+	wateroz = 4;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle5oz : ItemWaterbottle {
+	displayName = "Water Bottle (5oz)";
+	descriptionShort = "Watter Bottle with 5oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle5oz_ca.paa";
+	wateroz = 5;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle6oz : ItemWaterbottle {
+	displayName = "Water Bottle (6oz)";
+	descriptionShort = "Watter Bottle with 6oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle6oz_ca.paa";
+	wateroz = 6;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle7oz : ItemWaterbottle {
+	displayName = "Water Bottle (7oz)";
+	descriptionShort = "Watter Bottle with 7oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle7oz_ca.paa";
+	wateroz = 7;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle8oz : ItemWaterbottle {
+	displayName = "Water Bottle (8oz)";
+	descriptionShort = "Watter Bottle with 8oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle8oz_ca.paa";
+	wateroz = 8;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle9oz : ItemWaterbottle {
+	displayName = "Water Bottle (9oz)";
+	descriptionShort = "Watter Bottle with 9oz of water";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle9oz_ca.paa";
+	wateroz = 9;
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgMagazines/ItemWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/ItemWaterbottle.hpp
new file mode 100644
index 000000000..968b71a9d
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgMagazines/ItemWaterbottle.hpp
@@ -0,0 +1,30 @@
+class FoodDrink;
+class ItemWaterbottle: FoodDrink {
+	scope = 2;
+	refillable = 1;
+	sfx = "drink";
+	wateroz = 10;
+	displayName = "$STR_EQUIP_NAME_12";
+	model = "\dayz_equip\models\waterbottle_gear.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
+	descriptionShort = "$STR_EQUIP_DESC_12";
+};
+class ItemWaterbottleUnfilled: CA_Magazine {
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "$STR_EQUIP_NAME_13";
+	model = "\dayz_equip\models\waterbottle_gear.p3d";
+	picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
+	descriptionShort = "$STR_EQUIP_DESC_13";
+	class ItemActions {
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottleBoiled : ItemWaterbottle {
+	displayName = $STR_ITEMWATERBOTTLEBOILED_CODE_NAME;
+	descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC;
+};
\ No newline at end of file