diff --git a/src/engine.sln b/src/engine.sln
index a90f6652d59..c971ef57798 100644
--- a/src/engine.sln
+++ b/src/engine.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
 EndProject
@@ -637,13 +637,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{901F5C6A-BA06-4727-B9BC-762891749A46} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{68CB7CEC-F907-47AD-B624-B8432F53AAE3} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{2FAAC8BA-369F-465E-B465-2235963FD377} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
@@ -655,26 +648,33 @@ Global
 		{A4ABD75E-825B-4D09-B3B2-2709682E40C8} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{F1836CE2-59EF-4189-8B9C-D103A511CB27} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{3AD26FD3-4F52-4E22-A4CF-AD4C49E74C61} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
-		{F573DE85-0866-4775-955F-6C3241D2AE80} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{6BA3121A-ACBC-4685-9246-4549CA1EFFFD} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{39EE310B-4F1D-4716-A39F-4AB844DB3680} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{93AD3B7E-71DE-4FA2-90E7-A79782ED4960} = {901F5C6A-BA06-4727-B9BC-762891749A46}
-		{56AD8F54-F89E-4B5A-93F8-8A617BFD1160} = {901F5C6A-BA06-4727-B9BC-762891749A46}
-		{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
-		{B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
-		{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{EFB76D6F-0092-439C-A783-C0BE10BD17C9} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{EC924B9B-4991-4931-8623-E1DB9AE005CA} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
-		{E5F40F9E-C01B-4B97-9BD5-FC24308D8022} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{FFDF27A8-C198-49ED-BA13-4DA9054266C6} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{FA169092-EA3E-40C1-8E5A-A2B575700FE8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{032A10AB-E44C-4751-A290-001EF99E664A} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{1924EF23-A05E-40E5-93F2-6CCD64BE1F8B} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
+		{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
+		{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{FA169092-EA3E-40C1-8E5A-A2B575700FE8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{880CD250-BA77-4DAF-A8D4-552F12DD3AE4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{0EB257DC-5CFC-44B0-82C9-CE6B158BE473} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{901F5C6A-BA06-4727-B9BC-762891749A46} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{68CB7CEC-F907-47AD-B624-B8432F53AAE3} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{93AD3B7E-71DE-4FA2-90E7-A79782ED4960} = {901F5C6A-BA06-4727-B9BC-762891749A46}
+		{56AD8F54-F89E-4B5A-93F8-8A617BFD1160} = {901F5C6A-BA06-4727-B9BC-762891749A46}
+		{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{E5F40F9E-C01B-4B97-9BD5-FC24308D8022} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{FFDF27A8-C198-49ED-BA13-4DA9054266C6} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{F573DE85-0866-4775-955F-6C3241D2AE80} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{6BA3121A-ACBC-4685-9246-4549CA1EFFFD} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{39EE310B-4F1D-4716-A39F-4AB844DB3680} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
+		{B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
index f18c5caaaaf..bb36da94757 100644
--- a/src/xrGame/Actor.cpp
+++ b/src/xrGame/Actor.cpp
@@ -25,7 +25,7 @@
 #include "clsid_game.h"
 #include "game_cl_base_weapon_usage_statistic.h"
 #include "Grenade.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 
 // breakpoints
 #include "../xrEngine/xr_input.h"
diff --git a/src/xrGame/ActorCondition.cpp b/src/xrGame/ActorCondition.cpp
index 4041956c21e..ce8cdef1b3f 100644
--- a/src/xrGame/ActorCondition.cpp
+++ b/src/xrGame/ActorCondition.cpp
@@ -16,7 +16,7 @@
 #include "object_broker.h"
 #include "weapon.h"
 
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "ai/monsters/basemonster/base_monster.h"
 #include "UIGameCustom.h"
 #include "ui/UIMainIngameWnd.h"
diff --git a/src/xrGame/ActorHelmet.cpp b/src/xrGame/ActorHelmet.cpp
index 65e57992fa4..6c21196a1ce 100644
--- a/src/xrGame/ActorHelmet.cpp
+++ b/src/xrGame/ActorHelmet.cpp
@@ -2,7 +2,7 @@
 #include "ActorHelmet.h"
 #include "Actor.h"
 #include "Inventory.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 #include "BoneProtections.h"
 #include "../Include/xrRender/Kinematics.h"
 //#include "CustomOutfit.h"
diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
index 312e8340401..0fae7383ddc 100644
--- a/src/xrGame/ActorInput.cpp
+++ b/src/xrGame/ActorInput.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include <dinput.h>
 #include "Actor.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 #include "trade.h"
 #include "../xrEngine/CameraBase.h"
 
@@ -28,8 +28,7 @@
 #include "InventoryBox.h"
 #include "player_hud.h"
 #include "../xrEngine/xr_input.h"
-#include "flare.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "clsid_game.h"
 #include "hudmanager.h"
 #include "Weapon.h"
diff --git a/src/xrGame/Actor_Events.cpp b/src/xrGame/Actor_Events.cpp
index a35667cb5eb..65a92871736 100644
--- a/src/xrGame/Actor_Events.cpp
+++ b/src/xrGame/Actor_Events.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "actor.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "weapon.h"
 #include "artefact.h"
 #include "scope.h"
diff --git a/src/xrGame/CustomOutfit.cpp b/src/xrGame/CustomOutfit.cpp
index f6a5c6d78f7..3f6067553a1 100644
--- a/src/xrGame/CustomOutfit.cpp
+++ b/src/xrGame/CustomOutfit.cpp
@@ -203,7 +203,7 @@ BOOL	CCustomOutfit::BonePassBullet					(int boneID)
 	return m_boneProtection->getBonePassBullet(s16(boneID));
 }
 
-#include "torch.h"
+#include "item/ItemTorch.h"
 void	CCustomOutfit::OnMoveToSlot		(const SInvItemPlace& prev)
 {
 	if ( m_pInventory )
diff --git a/src/xrGame/ExoOutfit.cpp b/src/xrGame/ExoOutfit.cpp
deleted file mode 100644
index f6d22dee208..00000000000
--- a/src/xrGame/ExoOutfit.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-///////////////////////////////////////////////////////////////
-// ExoOutfit.h
-// ExoOutfit - защитный костюм с усилением
-///////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "stdafx.h"
-#include "exooutfit.h"
-
-CExoOutfit::CExoOutfit()
-{
-}
-
-CExoOutfit::~CExoOutfit() 
-{
-}
\ No newline at end of file
diff --git a/src/xrGame/ExoOutfit.h b/src/xrGame/ExoOutfit.h
deleted file mode 100644
index ab2a7173f57..00000000000
--- a/src/xrGame/ExoOutfit.h
+++ /dev/null
@@ -1,18 +0,0 @@
-///////////////////////////////////////////////////////////////
-// ExoOutfit.h
-// ExoOutfit - защитный костюм с усилением
-///////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#include "customoutfit.h"
-
-class CExoOutfit: public CCustomOutfit
-{
-private:
-    typedef	CCustomOutfit inherited;
-public:
-	CExoOutfit(void);
-	virtual ~CExoOutfit(void);
-};
diff --git a/src/xrGame/InfoDocument.cpp b/src/xrGame/InfoDocument.cpp
index 224d4a04f87..72787115bf4 100644
--- a/src/xrGame/InfoDocument.cpp
+++ b/src/xrGame/InfoDocument.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "InfoDocument.h"
 #include "../xrphysics/PhysicsShell.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "inventoryowner.h"
 #include "xrserver_objects_alife_items.h"
 
diff --git a/src/xrGame/InventoryOwner.cpp b/src/xrGame/InventoryOwner.cpp
index d24eee1cc2b..f7de77d3f5e 100644
--- a/src/xrGame/InventoryOwner.cpp
+++ b/src/xrGame/InventoryOwner.cpp
@@ -1,7 +1,7 @@
 #include "pch_script.h"
 #include "InventoryOwner.h"
 #include "entity_alive.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "actor.h"
 #include "trade.h"
 #include "inventory.h"
diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp
index 72b43357e64..e321417ef44 100644
--- a/src/xrGame/Level.cpp
+++ b/src/xrGame/Level.cpp
@@ -46,7 +46,7 @@
 #include "message_filter.h"
 #include "demoplay_control.h"
 #include "demoinfo.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "xrPhysics/IPHWorld.h"
 #include "xrPhysics/console_vars.h"
 
diff --git a/src/xrGame/MilitaryOutfit.cpp b/src/xrGame/MilitaryOutfit.cpp
deleted file mode 100644
index 1708fd5c919..00000000000
--- a/src/xrGame/MilitaryOutfit.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-///////////////////////////////////////////////////////////////
-// MilitaryOutfit.h
-// MilitaryOutfit - защитный костюм военного
-///////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "stdafx.h"
-#include "MilitaryOutfit.h"
-
-CMilitaryOutfit::CMilitaryOutfit()
-{
-}
-
-CMilitaryOutfit::~CMilitaryOutfit() 
-{
-}
\ No newline at end of file
diff --git a/src/xrGame/MilitaryOutfit.h b/src/xrGame/MilitaryOutfit.h
deleted file mode 100644
index b22b5a4c2a0..00000000000
--- a/src/xrGame/MilitaryOutfit.h
+++ /dev/null
@@ -1,18 +0,0 @@
-///////////////////////////////////////////////////////////////
-// MilitaryOutfit.h
-// MilitaryOutfit - защитный костюм военного
-///////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#include "customoutfit.h"
-
-class CMilitaryOutfit: public CCustomOutfit
-{
-private:
-    typedef	CCustomOutfit inherited;
-public:
-	CMilitaryOutfit(void);
-	virtual ~CMilitaryOutfit(void);
-};
diff --git a/src/xrGame/ScientificOutfit.cpp b/src/xrGame/ScientificOutfit.cpp
deleted file mode 100644
index d80a32aa630..00000000000
--- a/src/xrGame/ScientificOutfit.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-///////////////////////////////////////////////////////////////
-// ScientificOutfit.cpp
-// ScientificOutfit - защитный костюм ученого
-///////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "stdafx.h"
-#include "scientificoutfit.h"
-
-CScientificOutfit::CScientificOutfit()
-{
-}
-
-CScientificOutfit::~CScientificOutfit() 
-{
-}
\ No newline at end of file
diff --git a/src/xrGame/ScientificOutfit.h b/src/xrGame/ScientificOutfit.h
deleted file mode 100644
index f596ca2097e..00000000000
--- a/src/xrGame/ScientificOutfit.h
+++ /dev/null
@@ -1,18 +0,0 @@
-///////////////////////////////////////////////////////////////
-// ScientificOutfit.h
-// ScientificOutfit - защитный костюм ученого
-///////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#include "customoutfit.h"
-
-class CScientificOutfit: public CCustomOutfit
-{
-private:
-    typedef	CCustomOutfit inherited;
-public:
-	CScientificOutfit(void);
-	virtual ~CScientificOutfit(void);
-};
diff --git a/src/xrGame/UIZoneMap.cpp b/src/xrGame/UIZoneMap.cpp
index 1f163389709..ca7597c2d5e 100644
--- a/src/xrGame/UIZoneMap.cpp
+++ b/src/xrGame/UIZoneMap.cpp
@@ -2,7 +2,7 @@
 #include "uizonemap.h"
 
 #include "InfoPortion.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 
 #include "Grenade.h"
 #include "level.h"
diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
index 3cc4733c8ab..a601c4364e3 100644
--- a/src/xrGame/Weapon.cpp
+++ b/src/xrGame/Weapon.cpp
@@ -23,7 +23,7 @@
 #include "weaponBinocularsVision.h"
 #include "ui/UIWindow.h"
 #include "ui/UIXmlInit.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 
 #define WEAPON_REMOVE_TIME		60000
 #define ROTATION_TIME			0.25f
diff --git a/src/xrGame/actor_communication.cpp b/src/xrGame/actor_communication.cpp
index 5768815ea59..bd7df501145 100644
--- a/src/xrGame/actor_communication.cpp
+++ b/src/xrGame/actor_communication.cpp
@@ -1,7 +1,7 @@
 #include "pch_script.h"
 #include "actor.h"
 #include "UIGameSP.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "level.h"
 #include "string_table.h"
 #include "PhraseDialog.h"
@@ -26,7 +26,7 @@
 #include "GameTaskdefs.h"
 #include "infoportion.h"
 #include "inventory.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "ai/monsters/basemonster/base_monster.h"
 #include "ai/trader/ai_trader.h"
 
diff --git a/src/xrGame/ai/stalker/ai_stalker_events.cpp b/src/xrGame/ai/stalker/ai_stalker_events.cpp
index 53671b1c2a3..f4ae9900996 100644
--- a/src/xrGame/ai/stalker/ai_stalker_events.cpp
+++ b/src/xrGame/ai/stalker/ai_stalker_events.cpp
@@ -8,7 +8,7 @@
 
 #include "stdafx.h"
 #include "ai_stalker.h"
-#include "../../ItemPDA.h"
+#include "../../item/ItemPDA.h"
 #include "../../inventory.h"
 #include "../../../xrServerEntities/xrmessages.h"
 #include "../../shootingobject.h"
diff --git a/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp b/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp
index 763d12e7047..72c6c258b4f 100644
--- a/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp
+++ b/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp
@@ -10,7 +10,7 @@
 #include "ai_stalker.h"
 #include "../../stalker_animation_manager.h"
 #include "../../script_entity_action.h"
-#include "../../torch.h"
+#include "../../item/ItemTorch.h"
 #include "../../inventory.h"
 #include "../../weapon.h"
 #include "../../weaponmagazined.h"
diff --git a/src/xrGame/ai_stalker_alife.cpp b/src/xrGame/ai_stalker_alife.cpp
index 065747ab033..f3c002bc333 100644
--- a/src/xrGame/ai_stalker_alife.cpp
+++ b/src/xrGame/ai_stalker_alife.cpp
@@ -12,12 +12,12 @@
 #include "alife_simulator.h"
 #include "alife_space.h"
 #include "inventory.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "eatable_item.h"
 #include "medkit.h"
 #include "weapon.h"
 #include "Grenade.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "ef_storage.h"
 #include "ef_primary.h"
 #include "ef_pattern.h"
diff --git a/src/xrGame/ItemDetectorAdvanced.cpp b/src/xrGame/item/ItemDetectorAdvanced.cpp
similarity index 97%
rename from src/xrGame/ItemDetectorAdvanced.cpp
rename to src/xrGame/item/ItemDetectorAdvanced.cpp
index 52c095b7b38..f9e9020fb79 100644
--- a/src/xrGame/ItemDetectorAdvanced.cpp
+++ b/src/xrGame/item/ItemDetectorAdvanced.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "ItemDetectorAdvanced.h"
-#include "ui/ArtefactDetectorUI.h"
-#include "../Include/xrRender/Kinematics.h"
-#include "player_hud.h"
-#include "game_object_space.h"
+#include "../ui/ArtefactDetectorUI.h"
+#include "../../Include/xrRender/Kinematics.h"
+#include "../player_hud.h"
+#include "../game_object_space.h"
 
 
 CAdvancedDetector::CAdvancedDetector()
diff --git a/src/xrGame/ItemDetectorAdvanced.h b/src/xrGame/item/ItemDetectorAdvanced.h
similarity index 100%
rename from src/xrGame/ItemDetectorAdvanced.h
rename to src/xrGame/item/ItemDetectorAdvanced.h
diff --git a/src/xrGame/ItemDetectorCustom.cpp b/src/xrGame/item/ItemDetectorCustom.cpp
similarity index 96%
rename from src/xrGame/ItemDetectorCustom.cpp
rename to src/xrGame/item/ItemDetectorCustom.cpp
index b31abbf3842..c83171a7bbe 100644
--- a/src/xrGame/ItemDetectorCustom.cpp
+++ b/src/xrGame/item/ItemDetectorCustom.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "ItemDetectorCustom.h"
-#include "ui/ArtefactDetectorUI.h"
-#include "hudmanager.h"
-#include "inventory.h"
-#include "level.h"
-#include "map_manager.h"
-#include "ActorEffector.h"
-#include "actor.h"
-#include "ui/UIWindow.h"
-#include "player_hud.h"
-#include "weapon.h"
+#include "../ui/ArtefactDetectorUI.h"
+#include "../hudmanager.h"
+#include "../inventory.h"
+#include "../level.h"
+#include "../map_manager.h"
+#include "../ActorEffector.h"
+#include "../Actor.h"
+#include "../ui/UIWindow.h"
+#include "../player_hud.h"
+#include "../weapon.h"
 
 ITEM_INFO::ITEM_INFO()
 {
diff --git a/src/xrGame/ItemDetectorCustom.h b/src/xrGame/item/ItemDetectorCustom.h
similarity index 96%
rename from src/xrGame/ItemDetectorCustom.h
rename to src/xrGame/item/ItemDetectorCustom.h
index 023eff50d6a..ea750a97f16 100644
--- a/src/xrGame/ItemDetectorCustom.h
+++ b/src/xrGame/item/ItemDetectorCustom.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "inventory_item_object.h"
-#include "../xrEngine/feel_touch.h"
-#include "hudsound.h"
-#include "customzone.h"
-#include "artefact.h"
+#include "../inventory_item_object.h"
+#include "../../xrEngine/feel_touch.h"
+#include "../hudsound.h"
+#include "../customzone.h"
+#include "../artefact.h"
 #include "ai_sounds.h"
 //#include "ui/ArtefactDetectorUI.h"
 
diff --git a/src/xrGame/ItemDetectorElite.cpp b/src/xrGame/item/ItemDetectorElite.cpp
similarity index 100%
rename from src/xrGame/ItemDetectorElite.cpp
rename to src/xrGame/item/ItemDetectorElite.cpp
diff --git a/src/xrGame/ItemDetectorElite.h b/src/xrGame/item/ItemDetectorElite.h
similarity index 97%
rename from src/xrGame/ItemDetectorElite.h
rename to src/xrGame/item/ItemDetectorElite.h
index 46bea7a89be..67a82ce95a7 100644
--- a/src/xrGame/ItemDetectorElite.h
+++ b/src/xrGame/item/ItemDetectorElite.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "ItemDetectorCustom.h"
-#include "level.h"
+#include "../level.h"
 
 class CUIArtefactDetectorElite;
 
diff --git a/src/xrGame/ItemDetectorSimple.cpp b/src/xrGame/item/ItemDetectorSimple.cpp
similarity index 96%
rename from src/xrGame/ItemDetectorSimple.cpp
rename to src/xrGame/item/ItemDetectorSimple.cpp
index 80c3ebce7d9..76d373c6071 100644
--- a/src/xrGame/ItemDetectorSimple.cpp
+++ b/src/xrGame/item/ItemDetectorSimple.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "ItemDetectorSimple.h"
-#include "ui/ArtefactDetectorUI.h"
-#include "../Include/xrRender/Kinematics.h"
-#include "../xrEngine/LightAnimLibrary.h"
-#include "player_hud.h"
+#include "../ui/ArtefactDetectorUI.h"
+#include "../../Include/xrRender/Kinematics.h"
+#include "../../xrEngine/LightAnimLibrary.h"
+#include "../player_hud.h"
 
 CSimpleDetector::CSimpleDetector(void)
 {
diff --git a/src/xrGame/ItemDetectorSimple.h b/src/xrGame/item/ItemDetectorSimple.h
similarity index 100%
rename from src/xrGame/ItemDetectorSimple.h
rename to src/xrGame/item/ItemDetectorSimple.h
diff --git a/src/xrGame/ItemPDA.cpp b/src/xrGame/item/ItemPDA.cpp
similarity index 96%
rename from src/xrGame/ItemPDA.cpp
rename to src/xrGame/item/ItemPDA.cpp
index 6166d946269..eae8359498a 100644
--- a/src/xrGame/ItemPDA.cpp
+++ b/src/xrGame/item/ItemPDA.cpp
@@ -1,16 +1,16 @@
 #include "pch_script.h"
 #include "ItemPDA.h"
 #include "../xrphysics/PhysicsShell.h"
-#include "Entity.h"
-#include "actor.h"
+#include "../Entity.h"
+#include "../Actor.h"
 
-#include "xrserver.h"
+#include "../xrserver.h"
 #include "xrServer_Objects_ALife_Items.h"
-#include "level.h"
+#include "../level.h"
 
 #include "specific_character.h"
-#include "alife_registry_wrappers.h"
-#include "../xrServerEntities/script_engine.h"
+#include "../alife_registry_wrappers.h"
+#include "../../xrServerEntities/script_engine.h"
 
 
 CPda::CPda(void)						
diff --git a/src/xrGame/ItemPDA.h b/src/xrGame/item/ItemPDA.h
similarity index 95%
rename from src/xrGame/ItemPDA.h
rename to src/xrGame/item/ItemPDA.h
index 1f8495ea6b0..131cb7c666d 100644
--- a/src/xrGame/ItemPDA.h
+++ b/src/xrGame/item/ItemPDA.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../xrEngine/feel_touch.h"
-#include "inventory_item_object.h"
+#include "../../xrEngine/feel_touch.h"
+#include "../inventory_item_object.h"
 
 #include "InfoPortionDefs.h"
 #include "character_info_defs.h"
 
-#include "PdaMsg.h"
+#include "../PdaMsg.h"
 
 class CInventoryOwner;
 class CPda;
diff --git a/src/xrGame/Torch.cpp b/src/xrGame/item/ItemTorch.cpp
similarity index 98%
rename from src/xrGame/Torch.cpp
rename to src/xrGame/item/ItemTorch.cpp
index e5761d65c92..2854fd56a0f 100644
--- a/src/xrGame/Torch.cpp
+++ b/src/xrGame/item/ItemTorch.cpp
@@ -1,23 +1,23 @@
 #include "stdafx.h"
-#include "torch.h"
-#include "entity.h"
-#include "actor.h"
+#include "ItemTorch.h"
+#include "../Entity.h"
+#include "../Actor.h"
 #include "../xrEngine/LightAnimLibrary.h"
 #include "../xrphysics/PhysicsShell.h"
 #include "xrserver_objects_alife_items.h"
 #include "ai_sounds.h"
 
-#include "level.h"
+#include "../Level.h"
 #include "../Include/xrRender/Kinematics.h"
 #include "../xrEngine/camerabase.h"
 #include "../xrengine/xr_collide_form.h"
 #include "inventory.h"
 #include "game_base_space.h"
 
-#include "UIGameCustom.h"
-#include "actorEffector.h"
-#include "CustomOutfit.h"
-#include "ActorHelmet.h"
+#include "../UIGameCustom.h"
+#include "../actorEffector.h"
+#include "../CustomOutfit.h"
+#include "../ActorHelmet.h"
 
 static const float		TORCH_INERTION_CLAMP		= PI_DIV_6;
 static const float		TORCH_INERTION_SPEED_MAX	= 7.5f;
diff --git a/src/xrGame/Torch.h b/src/xrGame/item/ItemTorch.h
similarity index 97%
rename from src/xrGame/Torch.h
rename to src/xrGame/item/ItemTorch.h
index df2c5bd314f..06fcc5e2ec3 100644
--- a/src/xrGame/Torch.h
+++ b/src/xrGame/item/ItemTorch.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "inventory_item_object.h"
-#include "hudsound.h"
+#include "../inventory_item_object.h"
+#include "../hudsound.h"
 #include "script_export_space.h"
 
 class CLAItem;
diff --git a/src/xrGame/torch_script.cpp b/src/xrGame/item/ItemTorch_script.cpp
similarity index 96%
rename from src/xrGame/torch_script.cpp
rename to src/xrGame/item/ItemTorch_script.cpp
index dc450aca26d..191f7e87fd5 100644
--- a/src/xrGame/torch_script.cpp
+++ b/src/xrGame/item/ItemTorch_script.cpp
@@ -1,5 +1,5 @@
 #include "pch_script.h"
-#include "torch.h"
+#include "ItemTorch.h"
 #include "ItemPDA.h"
 #include "ItemDetectorSimple.h"
 #include "ItemDetectorElite.h"
diff --git a/src/xrGame/object_handler.cpp b/src/xrGame/object_handler.cpp
index 5d231025730..c7dcb93c958 100644
--- a/src/xrGame/object_handler.cpp
+++ b/src/xrGame/object_handler.cpp
@@ -17,7 +17,7 @@
 #include "ef_pattern.h"
 #include "ai/stalker/ai_stalker.h"
 #include "inventory.h"
-#include "torch.h"
+#include "item/ItemTorch.h"
 #include "../Include/xrRender/Kinematics.h"
 #include "memory_manager.h"
 #include "enemy_manager.h"
diff --git a/src/xrGame/script_game_object2.cpp b/src/xrGame/script_game_object2.cpp
index c302a83ca7e..3eb83a50b1f 100644
--- a/src/xrGame/script_game_object2.cpp
+++ b/src/xrGame/script_game_object2.cpp
@@ -16,7 +16,7 @@
 #include "object_handler.h"
 #include "script_hit.h"
 #include "../Include/xrRender/Kinematics.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "InfoPortion.h"
 #include "memory_manager.h"
 #include "ai_phrasedialogmanager.h"
diff --git a/src/xrGame/script_game_object_inventory_owner.cpp b/src/xrGame/script_game_object_inventory_owner.cpp
index 21bc4b47aa4..487ca899427 100644
--- a/src/xrGame/script_game_object_inventory_owner.cpp
+++ b/src/xrGame/script_game_object_inventory_owner.cpp
@@ -6,7 +6,7 @@
 #include "script_game_object.h"
 #include "script_game_object_impl.h"
 #include "InventoryOwner.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "xrMessages.h"
 #include "character_info.h"
 #include "gametask.h"
@@ -42,10 +42,10 @@
 #include "ai/stalker/ai_stalker_impl.h"
 #include "smart_cover_object.h"
 #include "smart_cover.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "doors_manager.h"
 #include "doors_door.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 #include "physicobject.h"
 
 bool CScriptGameObject::GiveInfoPortion(LPCSTR info_id)
diff --git a/src/xrGame/ui/UIActorMenu.cpp b/src/xrGame/ui/UIActorMenu.cpp
index 2ff7fe606ae..d8273a5bc99 100644
--- a/src/xrGame/ui/UIActorMenu.cpp
+++ b/src/xrGame/ui/UIActorMenu.cpp
@@ -20,7 +20,7 @@
 #include "../trade_parameters.h"
 #include "../ActorHelmet.h"
 #include "../CustomOutfit.h"
-#include "../ItemDetectorCustom.h"
+#include "../item/ItemDetectorCustom.h"
 #include "../eatable_item.h"
 
 #include "UIProgressBar.h"
diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp
index 3a75869c000..f7781c90217 100644
--- a/src/xrGame/ui/UIActorMenuInventory.cpp
+++ b/src/xrGame/ui/UIActorMenuInventory.cpp
@@ -31,8 +31,8 @@
 #include "../UICursor.h"
 #include "../MPPlayersBag.h"
 #include "../player_hud.h"
-#include "../ItemDetectorCustom.h"
-#include "../ItemPDA.h"
+#include "../item/ItemDetectorCustom.h"
+#include "../item/ItemPDA.h"
 
 #include "../actor_defs.h"
 
diff --git a/src/xrGame/ui/UIHudStatesWnd.cpp b/src/xrGame/ui/UIHudStatesWnd.cpp
index 432f72aa614..181c16c7113 100644
--- a/src/xrGame/ui/UIHudStatesWnd.cpp
+++ b/src/xrGame/ui/UIHudStatesWnd.cpp
@@ -16,9 +16,9 @@
 #include "UIHelper.h"
 #include "ui_arrow.h"
 #include "UIInventoryUtilities.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "../ai/monsters/basemonster/base_monster.h"
-#include "../ItemPDA.h"
+#include "../item/ItemPDA.h"
 #include "WeaponMagazinedWGrenade.h"
 
 CUIHudStatesWnd::CUIHudStatesWnd()
diff --git a/src/xrGame/ui/UIMainIngameWnd.cpp b/src/xrGame/ui/UIMainIngameWnd.cpp
index d3207853498..6e24eb6889d 100644
--- a/src/xrGame/ui/UIMainIngameWnd.cpp
+++ b/src/xrGame/ui/UIMainIngameWnd.cpp
@@ -11,7 +11,7 @@
 #include "../EntityCondition.h"
 #include "../CustomOutfit.h"
 #include "../ActorHelmet.h"
-#include "../ItemPDA.h"
+#include "../item/ItemPDA.h"
 #include "../xrServerEntities/character_info.h"
 #include "../inventory.h"
 #include "../UIGameSP.h"
diff --git a/src/xrGame/ui/UIPdaWnd.cpp b/src/xrGame/ui/UIPdaWnd.cpp
index 7b1f33077b5..d2076440c49 100644
--- a/src/xrGame/ui/UIPdaWnd.cpp
+++ b/src/xrGame/ui/UIPdaWnd.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "UIPdaWnd.h"
-#include "../ItemPDA.h"
+#include "../item/ItemPDA.h"
 
 #include "xrUIXmlParser.h"
 #include "UIXmlInit.h"
diff --git a/src/xrGame/ui/UIStalkersRankingWnd.cpp b/src/xrGame/ui/UIStalkersRankingWnd.cpp
index 6913fae25b8..338bc7811c4 100644
--- a/src/xrGame/ui/UIStalkersRankingWnd.cpp
+++ b/src/xrGame/ui/UIStalkersRankingWnd.cpp
@@ -10,7 +10,7 @@
 #include "UICharacterInfo.h"
 #include "../InventoryOwner.h"
 #include "../Level.h"
-#include "../ItemPDA.h"
+#include "../item/ItemPDA.h"
 #include "../actor.h"
 #include "../../xrServerEntities/xrServer_Objects_ALife_Monsters.h"
 
diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp
index 37891d32734..98c147c4e3b 100644
--- a/src/xrGame/ui/UITalkWnd.cpp
+++ b/src/xrGame/ui/UITalkWnd.cpp
@@ -6,7 +6,7 @@
 #include "../actor.h"
 #include "../trade.h"
 #include "../UIGameSP.h"
-#include "../ItemPDA.h"
+#include "../item/ItemPDA.h"
 #include "../../xrServerEntities/character_info.h"
 #include "../level.h"
 
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
index d4bbd4d1907..b4db1f5fe3c 100644
--- a/src/xrGame/xrGame.vcxproj
+++ b/src/xrGame/xrGame.vcxproj
@@ -375,7 +375,7 @@
     <ClInclude Include="actor_mp_state_inline.h" />
     <ClInclude Include="actor_statistic_defs.h" />
     <ClInclude Include="actor_statistic_mgr.h" />
-    <ClInclude Include="ItemDetectorAdvanced.h" />
+    <ClInclude Include="item\ItemDetectorAdvanced.h" />
     <ClInclude Include="agent_corpse_manager.h" />
     <ClInclude Include="agent_corpse_manager_inline.h" />
     <ClInclude Include="agent_enemy_manager.h" />
@@ -884,7 +884,7 @@
     <ClInclude Include="cover_point_inline.h" />
     <ClInclude Include="cta_game_artefact.h" />
     <ClInclude Include="cta_game_artefact_activation.h" />
-    <ClInclude Include="ItemDetectorCustom.h" />
+    <ClInclude Include="item\ItemDetectorCustom.h" />
     <ClInclude Include="CustomMonster.h" />
     <ClInclude Include="CustomMonster_inline.h" />
     <ClInclude Include="CustomOutfit.h" />
@@ -957,7 +957,7 @@
     <ClInclude Include="ef_storage.h" />
     <ClInclude Include="ef_storage_inline.h" />
     <ClInclude Include="ElectricBall.h" />
-    <ClInclude Include="ItemDetectorElite.h" />
+    <ClInclude Include="item\ItemDetectorElite.h" />
     <ClInclude Include="encyclopedia_article.h" />
     <ClInclude Include="encyclopedia_article_defs.h" />
     <ClInclude Include="enemy_manager.h" />
@@ -967,7 +967,6 @@
     <ClInclude Include="entity_alive.h" />
     <ClInclude Include="entity_alive_inline.h" />
     <ClInclude Include="event_conditions_collection.h" />
-    <ClInclude Include="ExoOutfit.h" />
     <CustomBuild Include="Explosive.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
@@ -982,7 +981,6 @@
     <ClInclude Include="file_transfer.h" />
     <ClInclude Include="fire_disp_controller.h" />
     <ClInclude Include="first_bullet_controller.h" />
-    <ClInclude Include="flare.h" />
     <ClInclude Include="FoodItem.h" />
     <ClInclude Include="FryupZone.h" />
     <ClInclude Include="fs_registrator.h" />
@@ -1192,7 +1190,6 @@
     <ClInclude Include="memory_space_impl.h" />
     <ClInclude Include="MercuryBall.h" />
     <ClInclude Include="Message_Filter.h" />
-    <ClInclude Include="MilitaryOutfit.h" />
     <ClInclude Include="Mincer.h" />
     <ClInclude Include="Missile.h" />
     <ClInclude Include="mixed_delegate.h" />
@@ -1275,7 +1272,7 @@
     <ClInclude Include="patrol_path_storage_inline.h" />
     <ClInclude Include="patrol_point.h" />
     <ClInclude Include="patrol_point_inline.h" />
-    <ClInclude Include="ItemPDA.h" />
+    <ClInclude Include="item\ItemPDA.h" />
     <ClInclude Include="PdaMsg.h" />
     <ClInclude Include="pda_space.h" />
     <ClInclude Include="PHCollisionDamageReceiver.h" />
@@ -1383,7 +1380,6 @@
     <ClInclude Include="safe_map_iterator_inline.h" />
     <ClInclude Include="saved_game_wrapper.h" />
     <ClInclude Include="saved_game_wrapper_inline.h" />
-    <ClInclude Include="ScientificOutfit.h" />
     <ClInclude Include="Scope.h" />
     <ClInclude Include="screenshots_common.h" />
     <ClInclude Include="screenshots_writer.h" />
@@ -1472,7 +1468,7 @@
     <ClInclude Include="sight_manager_space.h" />
     <ClInclude Include="Silencer.h" />
     <ClInclude Include="silent_shots.h" />
-    <ClInclude Include="ItemDetectorSimple.h" />
+    <ClInclude Include="item\ItemDetectorSimple.h" />
     <ClInclude Include="smart_cover.h" />
     <ClInclude Include="smart_cover_action.h" />
     <ClInclude Include="smart_cover_action_inline.h" />
@@ -1624,7 +1620,7 @@
     <ClInclude Include="team_hierarchy_holder_inline.h" />
     <ClInclude Include="TeleWhirlwind.h" />
     <ClInclude Include="ThornArtifact.h" />
-    <ClInclude Include="Torch.h" />
+    <ClInclude Include="item\ItemTorch.h" />
     <ClInclude Include="TorridZone.h" />
     <ClInclude Include="Tracer.h" />
     <ClInclude Include="trade.h" />
@@ -2113,7 +2109,7 @@
     <ClCompile Include="Actor_Sleep.cpp" />
     <ClCompile Include="actor_statistic_mgr.cpp" />
     <ClCompile Include="Actor_Weapon.cpp" />
-    <ClCompile Include="ItemDetectorAdvanced.cpp" />
+    <ClCompile Include="item\ItemDetectorAdvanced.cpp" />
     <ClCompile Include="agent_corpse_manager.cpp" />
     <ClCompile Include="agent_enemy_manager.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
@@ -2574,7 +2570,7 @@
     </ClCompile>
     <ClCompile Include="cta_game_artefact.cpp" />
     <ClCompile Include="cta_game_artefact_activation.cpp" />
-    <ClCompile Include="ItemDetectorCustom.cpp" />
+    <ClCompile Include="item\ItemDetectorCustom.cpp" />
     <ClCompile Include="CustomMonster.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
@@ -2641,7 +2637,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <ClCompile Include="ElectricBall.cpp" />
-    <ClCompile Include="ItemDetectorElite.cpp" />
+    <ClCompile Include="item\ItemDetectorElite.cpp" />
     <ClCompile Include="encyclopedia_article.cpp" />
     <ClCompile Include="enemy_manager.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
@@ -2654,7 +2650,6 @@
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <ClCompile Include="event_conditions_collection.cpp" />
-    <ClCompile Include="ExoOutfit.cpp" />
     <ClCompile Include="Explosive.cpp" />
     <ClCompile Include="ExplosiveItem.cpp" />
     <ClCompile Include="ExplosiveRocket.cpp" />
@@ -2673,7 +2668,6 @@
     <ClCompile Include="file_transfer.cpp" />
     <ClCompile Include="fire_disp_controller.cpp" />
     <ClCompile Include="first_bullet_controller.cpp" />
-    <ClCompile Include="flare.cpp" />
     <ClCompile Include="FoodItem.cpp" />
     <ClCompile Include="FryupZone.cpp" />
     <ClCompile Include="fs_registrator_script.cpp">
@@ -2981,7 +2975,6 @@
     </ClCompile>
     <ClCompile Include="MercuryBall.cpp" />
     <ClCompile Include="Message_Filter.cpp" />
-    <ClCompile Include="MilitaryOutfit.cpp" />
     <ClCompile Include="Mincer.cpp" />
     <ClCompile Include="mincer_script.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
@@ -3049,7 +3042,7 @@
     </ClCompile>
     <ClCompile Include="patrol_path_storage.cpp" />
     <ClCompile Include="patrol_point.cpp" />
-    <ClCompile Include="ItemPDA.cpp">
+    <ClCompile Include="item\ItemPDA.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -3190,7 +3183,6 @@
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="ScientificOutfit.cpp" />
     <ClCompile Include="Scope.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
@@ -3406,7 +3398,7 @@
     <ClCompile Include="sight_manager_target.cpp" />
     <ClCompile Include="Silencer.cpp" />
     <ClCompile Include="silent_shots.cpp" />
-    <ClCompile Include="ItemDetectorSimple.cpp" />
+    <ClCompile Include="item\ItemDetectorSimple.cpp" />
     <ClCompile Include="smart_cover.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
@@ -3645,8 +3637,8 @@
     <ClCompile Include="team_hierarchy_holder.cpp" />
     <ClCompile Include="TeleWhirlwind.cpp" />
     <ClCompile Include="ThornArtifact.cpp" />
-    <ClCompile Include="Torch.cpp" />
-    <ClCompile Include="torch_script.cpp">
+    <ClCompile Include="item\ItemTorch.cpp" />
+    <ClCompile Include="item\ItemTorch_script.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
index 7874d7c9528..a64a6048cf3 100644
--- a/src/xrGame/xrGame.vcxproj.filters
+++ b/src/xrGame/xrGame.vcxproj.filters
@@ -1879,9 +1879,6 @@
     <Filter Include="Core\Client\Objects\items &amp; weapons\Devices\Torch">
       <UniqueIdentifier>{aba5d59b-9d45-48d4-824e-ac2e133ad875}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\Client\Objects\items &amp; weapons\Devices\flare">
-      <UniqueIdentifier>{8b5e7495-9945-41d5-92ad-ee33ee7900f9}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Core\Client\Objects\items &amp; weapons\PDA &amp; information">
       <UniqueIdentifier>{18753230-e688-46c5-9d53-9b4845eca8a6}</UniqueIdentifier>
     </Filter>
@@ -5904,12 +5901,6 @@
     <ClInclude Include="ui\ArtefactDetectorUI.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors</Filter>
     </ClInclude>
-    <ClInclude Include="Torch.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
-    </ClInclude>
-    <ClInclude Include="flare.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\Devices\flare</Filter>
-    </ClInclude>
     <ClInclude Include="pda_space.h">
       <Filter>Core\Client\Objects\items &amp; weapons\PDA &amp; information</Filter>
     </ClInclude>
@@ -5937,15 +5928,6 @@
     <ClInclude Include="CustomOutfit.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
     </ClInclude>
-    <ClInclude Include="ExoOutfit.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClInclude>
-    <ClInclude Include="MilitaryOutfit.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClInclude>
-    <ClInclude Include="ScientificOutfit.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClInclude>
     <ClInclude Include="StalkerOutfit.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
     </ClInclude>
@@ -7362,21 +7344,24 @@
     <ClInclude Include="ui\ChangeWeatherDialog.hpp">
       <Filter>UI\Multiplayer\Voting</Filter>
     </ClInclude>
-    <ClInclude Include="ItemPDA.h">
-      <Filter>Core\Client\Objects\items &amp; weapons\PDA &amp; information</Filter>
-    </ClInclude>
-    <ClInclude Include="ItemDetectorAdvanced.h">
+    <ClInclude Include="item\ItemDetectorAdvanced.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\AdvancedDetector</Filter>
     </ClInclude>
-    <ClInclude Include="ItemDetectorElite.h">
+    <ClInclude Include="item\ItemDetectorElite.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\EliteDetector</Filter>
     </ClInclude>
-    <ClInclude Include="ItemDetectorSimple.h">
+    <ClInclude Include="item\ItemDetectorSimple.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\Simple Detector</Filter>
     </ClInclude>
-    <ClInclude Include="ItemDetectorCustom.h">
+    <ClInclude Include="item\ItemDetectorCustom.h">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors</Filter>
     </ClInclude>
+    <ClInclude Include="item\ItemPDA.h">
+      <Filter>Core\Client\Objects\items &amp; weapons\PDA &amp; information</Filter>
+    </ClInclude>
+    <ClInclude Include="item\ItemTorch.h">
+      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -9479,15 +9464,6 @@
     <ClCompile Include="ui\ArtefactDetectorUI.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors</Filter>
     </ClCompile>
-    <ClCompile Include="Torch.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
-    </ClCompile>
-    <ClCompile Include="torch_script.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
-    </ClCompile>
-    <ClCompile Include="flare.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Devices\flare</Filter>
-    </ClCompile>
     <ClCompile Include="antirad.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Food &amp; Drugs</Filter>
     </ClCompile>
@@ -9509,15 +9485,6 @@
     <ClCompile Include="CustomOutfit.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
     </ClCompile>
-    <ClCompile Include="ExoOutfit.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClCompile>
-    <ClCompile Include="MilitaryOutfit.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClCompile>
-    <ClCompile Include="ScientificOutfit.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
-    </ClCompile>
     <ClCompile Include="StalkerOutfit.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Outfit</Filter>
     </ClCompile>
@@ -11009,21 +10976,27 @@
     <ClCompile Include="ui\ChangeWeatherDialog.cpp">
       <Filter>UI\Multiplayer\Voting</Filter>
     </ClCompile>
-    <ClCompile Include="ItemPDA.cpp">
-      <Filter>Core\Client\Objects\items &amp; weapons\PDA &amp; information</Filter>
-    </ClCompile>
-    <ClCompile Include="ItemDetectorAdvanced.cpp">
+    <ClCompile Include="item\ItemDetectorAdvanced.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\AdvancedDetector</Filter>
     </ClCompile>
-    <ClCompile Include="ItemDetectorElite.cpp">
+    <ClCompile Include="item\ItemDetectorElite.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\EliteDetector</Filter>
     </ClCompile>
-    <ClCompile Include="ItemDetectorSimple.cpp">
+    <ClCompile Include="item\ItemDetectorSimple.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors\Simple Detector</Filter>
     </ClCompile>
-    <ClCompile Include="ItemDetectorCustom.cpp">
+    <ClCompile Include="item\ItemDetectorCustom.cpp">
       <Filter>Core\Client\Objects\items &amp; weapons\Devices\Detectors</Filter>
     </ClCompile>
+    <ClCompile Include="item\ItemPDA.cpp">
+      <Filter>Core\Client\Objects\items &amp; weapons\PDA &amp; information</Filter>
+    </ClCompile>
+    <ClCompile Include="item\ItemTorch_script.cpp">
+      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
+    </ClCompile>
+    <ClCompile Include="item\ItemTorch.cpp">
+      <Filter>Core\Client\Objects\items &amp; weapons\Devices\Torch</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">
diff --git a/src/xrServerEntities/object_factory_register.cpp b/src/xrServerEntities/object_factory_register.cpp
index 88aca6c2293..08b8d3fcbae 100644
--- a/src/xrServerEntities/object_factory_register.cpp
+++ b/src/xrServerEntities/object_factory_register.cpp
@@ -111,10 +111,7 @@
 #	include "infodocument.h"
 #	include "attachable_item.h"
 
-#	include "ScientificOutfit.h"
 #	include "StalkerOutfit.h"
-#	include "MilitaryOutfit.h"
-#	include "ExoOutfit.h"
 #	include "ActorHelmet.h"
 
 #	include "f1.h"
@@ -137,14 +134,13 @@
 #	include "hairszone.h"
 //. #	include "amebazone.h"
 #	include "nogravityzone.h"
-#	include "ItemDetectorSimple.h"
-#	include "ItemDetectorElite.h"
-#	include "ItemDetectorAdvanced.h"
+#	include "item/ItemDetectorSimple.h"
+#	include "item/ItemDetectorElite.h"
+#	include "item/ItemDetectorAdvanced.h"
 #	include "zonecampfire.h"
 
-#	include "torch.h"
-#	include "ItemPDA.h"
-#	include "flare.h"
+#	include "item/ItemTorch.h"
+#	include "item/ItemPDA.h"
 
 #	include "searchlight.h"
 
@@ -346,10 +342,7 @@ void CObjectFactory::register_classes	()
 	ADD(CInventoryItemObject	,CSE_ALifeItem					,CLSID_IITEM_ATTACH				,"obj_attachable");
 
 	//Equipment outfit
-	ADD(CScientificOutfit		,CSE_ALifeItemCustomOutfit		,CLSID_EQUIPMENT_SCIENTIFIC		,"equ_scientific");
 	ADD(CStalkerOutfit			,CSE_ALifeItemCustomOutfit		,CLSID_EQUIPMENT_STALKER		,"equ_stalker");
-	ADD(CMilitaryOutfit			,CSE_ALifeItemCustomOutfit		,CLSID_EQUIPMENT_MILITARY		,"equ_military");
-	ADD(CExoOutfit				,CSE_ALifeItemCustomOutfit		,CLSID_EQUIPMENT_EXO			,"equ_exo");
 	ADD(CHelmet					,CSE_ALifeItem					,CLSID_EQUIPMENT_HELMET			,"helmet");
 
 	// Grenades
@@ -394,7 +387,6 @@ void CObjectFactory::register_classes	()
 	// Devices
 	ADD(CTorch					,CSE_ALifeItemTorch				,CLSID_DEVICE_TORCH				,"device_torch");
 	ADD(CPda					,CSE_ALifeItemPDA				,CLSID_DEVICE_PDA				,"device_pda");
-	ADD(CFlare					,CSE_ALifeItem					,CLSID_DEVICE_FLARE				,"device_flare");
 
 	// objects
 	ADD(CProjector				,CSE_ALifeObjectProjector		,CLSID_OBJECT_PROJECTOR			,"projector");
diff --git a/src/xrServerEntities/script_engine_export.h b/src/xrServerEntities/script_engine_export.h
index eb07754e872..fbfe6bd4cb7 100644
--- a/src/xrServerEntities/script_engine_export.h
+++ b/src/xrServerEntities/script_engine_export.h
@@ -118,7 +118,7 @@
 #	include "RGD5.h"
 #	include "Scope.h"
 #	include "StalkerOutfit.h"
-#	include "Torch.h"
+#	include "item/ItemTorch.h"
 #	include "WeaponAK74.h"
 #	include "WeaponBinoculars.h"
 #	include "WeaponBM16.h"