diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
new file mode 100644
index 000000000..f9be7e5ff
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
@@ -0,0 +1,28 @@
+class Land_A_tent;
+class LockboxStorageLocked: Land_A_tent {
+	vehicleClass = "Survival";
+	displayName = "Locked Lockbox";
+	model = "\z\addons\dayz_epoch\models\lockbox.p3d";
+	destrType = "DestructNo";
+	armor = 800;
+	transportMaxMagazines = 0;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	offset[] = {0,1.5,0.5};
+	lockable = 2;
+	unlockedClass = "LockboxStorage";
+	nounderground = 0;
+	requireplot = 0;
+};
+class LockboxStorage: Land_A_tent {
+	vehicleClass = "Survival";
+	displayName = "Lockbox";
+	model = "\z\addons\dayz_epoch\models\lockbox.p3d";
+	destrType = "DestructNo";
+	armor = 800;
+	transportMaxMagazines = 50;
+	transportMaxWeapons = 20;
+	transportMaxBackpacks = 10;
+	lockedClass = "LockboxStorageLocked";
+	packedClass = "WeaponHolder_ItemLockbox";
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
new file mode 100644
index 000000000..c83030c93
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
@@ -0,0 +1,30 @@
+class Land_A_tent;
+class VaultStorage: Land_A_tent {
+	placement = "vertical";
+	vehicleClass = "Survival";
+	displayName = "Safe";
+	model = "\z\addons\dayz_epoch\models\safe.p3d";
+	destrType = "DestructNo";
+	armor = 800;
+	transportMaxMagazines = 200;
+	transportMaxWeapons = 25;
+	transportMaxBackpacks = 10;
+	lockedClass = "VaultStorageLocked";
+	packedClass = "WeaponHolder_ItemVault";
+};	
+class VaultStorageLocked: Land_A_tent {
+	placement = "vertical";
+	vehicleClass = "Survival";
+	displayName = "Locked Safe";
+	model = "\z\addons\dayz_epoch\models\safe.p3d";
+	destrType = "DestructNo";
+	armor = 800;
+	transportMaxMagazines = 0;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	offset[] = {0,1.5,0};
+	lockable = 4;
+	unlockedClass = "VaultStorage";
+	requireplot = 0;
+	nounderground = 0;
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp
index 749065ce8..f7bd600a9 100644
--- a/SQF/dayz_code/Configs/cfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/cfgVehicles.hpp
@@ -15,8 +15,9 @@ class CfgVehicles {
 	
 	class HouseBase;
 	class Ruins: HouseBase {};
-        #include "CfgVehicles\antihack_plants.hpp"
-	#include "CfgVehicles\DZE\Doors.hpp"
+	#include "CfgVehicles\antihack_plants.hpp"
+	#include "CfgVehicles\DZE\LockboxStorage.hpp"
+	#include "CfgVehicles\DZE\VaultStorage.hpp"
 
 	class AllVehicles;
 	
@@ -2635,67 +2636,6 @@ class CfgVehicles {
 		create = "WeaponHolder_ItemTentDomed2";
 		offset[] = {0,2.5,0};
 	};
-	class VaultStorage: Land_A_tent
-	{
-		placement = "vertical";
-		vehicleClass = "Survival";
-		displayName = "Safe";
-		model = "\z\addons\dayz_epoch\models\safe.p3d";
-		destrType = "DestructNo";
-		armor = 800;
-		transportMaxMagazines = 200;
-		transportMaxWeapons = 25;
-		transportMaxBackpacks = 10;
-		lockedClass = "VaultStorageLocked";
-		packedClass = "WeaponHolder_ItemVault";
-	};	
-	class VaultStorageLocked: Land_A_tent
-	{
-		placement = "vertical";
-		vehicleClass = "Survival";
-		displayName = "Locked Safe";
-		model = "\z\addons\dayz_epoch\models\safe.p3d";
-		destrType = "DestructNo";
-		armor = 800;
-		transportMaxMagazines = 0;
-		transportMaxWeapons = 0;
-		transportMaxBackpacks = 0;
-		offset[] = {0,1.5,0};
-		lockable = 4;
-		unlockedClass = "VaultStorage";
-		requireplot = 0;
-		nounderground = 0;
-	};
-
-	class LockboxStorageLocked: Land_A_tent
-	{
-		vehicleClass = "Survival";
-		displayName = "Locked Lockbox";
-		model = "\z\addons\dayz_epoch\models\lockbox.p3d";
-		destrType = "DestructNo";
-		armor = 800;
-		transportMaxMagazines = 0;
-		transportMaxWeapons = 0;
-		transportMaxBackpacks = 0;
-		offset[] = {0,1.5,0.5};
-		lockable = 2;
-		unlockedClass = "LockboxStorage";
-		nounderground = 0;
-		requireplot = 0;
-	};
-	class LockboxStorage: Land_A_tent
-	{
-		vehicleClass = "Survival";
-		displayName = "Lockbox";
-		model = "\z\addons\dayz_epoch\models\lockbox.p3d";
-		destrType = "DestructNo";
-		armor = 800;
-		transportMaxMagazines = 50;
-		transportMaxWeapons = 20;
-		transportMaxBackpacks = 10;
-		lockedClass = "LockboxStorageLocked";
-		packedClass = "WeaponHolder_ItemLockbox";
-	};	
 	class GraveDZE: Land_A_tent
 	{
 		vehicleClass = "Survival";