diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditAmmunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditAmmunition.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditClothing.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditClothing.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditClothing.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditClothing.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditHelicopterArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditHelicopterArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditHelicopterArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditHelicopterArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditMilitaryArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditMilitaryArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditTrucksArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditTrucksArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditTrucksArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditTrucksArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/BanditWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/BanditWeapons.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyAssaultRifle.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyAssaultRifleAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifleAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyAssaultRifleAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifleAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBackpacks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBackpacks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBikesandATV.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBikesandATV.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBikesandATV.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBikesandATV.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBuildingSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBuildingSupplies.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBusesandVans.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBusesandVans.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyBusesandVans.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBusesandVans.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyCargoTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyCargoTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyChemlitesFlares.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyChemlitesFlares.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyChemlitesFlares.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyChemlitesFlares.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyClothes.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyClothes.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyClothes.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyClothes.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyCookedMeats.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCookedMeats.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyCookedMeats.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCookedMeats.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyDrinks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyDrinks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyDrinks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyDrinks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyFuelTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyFuelTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyFuelTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyFuelTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyLightMachineGun.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyLightMachineGun.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyLightMachineGunAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyLightMachineGunAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyMedicalSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyMedicalSupplies.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyMilitaryUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyMilitaryUnarmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPackagedFood.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPackagedFood.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPackagedFood.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPackagedFood.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPistolAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistolAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPistolAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistolAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPistols.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyPistols.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyShotgunsandSingleshot.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyShotgunsandSingleshot.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyShotgunsandSingleshotAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyShotgunsandSingleshotAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySmokeGrenades.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySmokeGrenades.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySmokeGrenades.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySmokeGrenades.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySniperRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySniperRifle.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySniperRifleAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySniperRifleAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySubmachineGunAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGunAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySubmachineGunAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGunAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySubmachineGuns.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlySubmachineGuns.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyToolbeltItems.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyToolbeltItems.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyTrucksUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyTrucksUnarmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyTrucksUnarmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyTrucksUnarmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyUsedCars.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyUsedCars.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyUsedCars.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyUsedCars.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyUtilityVehicles.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyUtilityVehicles.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyUtilityVehicles.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyUtilityVehicles.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyVehicleParts.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyVehicleParts.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/FriendlyVehicleParts.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyVehicleParts.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroAmmunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroAmmunition.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroAmmunition.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroAmmunition.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroClothes.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroClothes.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroClothes.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroClothes.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroHelicopterArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroHelicopterArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroHelicopterArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroHelicopterArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroMilitaryArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroMilitaryArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroMilitaryArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroMilitaryArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroTrucksArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroTrucksArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroTrucksArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroTrucksArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/HeroWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroWeapons.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/HeroWeapons.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/HeroWeapons.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAirplanes.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAirplanes.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAirplanes.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAirplanes.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAssaultRifle.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAssaultRifle.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAssaultRifle.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAssaultRifleAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAssaultRifleAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralAssaultRifleAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAssaultRifleAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBackpacks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBackpacks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBackpacks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBackpacks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBikesandATV.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBikesandATV.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBikesandATV.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBikesandATV.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBlackMarketAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBlackMarketAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBlackMarketWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBlackMarketWeapons.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBoatsArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBoatsArmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBoatsArmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBoatsArmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBoatsUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBoatsUnarmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBoatsUnarmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBoatsUnarmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBuildingSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBuildingSupplies.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBuildingSupplies.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBuildingSupplies.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBusesandVans.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBusesandVans.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralBusesandVans.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBusesandVans.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralCargoTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralCargoTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralCargoTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralCargoTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralChemlitesFlares.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralChemlitesFlares.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralChemlitesFlares.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralChemlitesFlares.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralClothes.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralClothes.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralClothes.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralClothes.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralCookedMeats.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralCookedMeats.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralCookedMeats.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralCookedMeats.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralDrinks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralDrinks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralDrinks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralDrinks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralExplosives.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralExplosives.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralExplosives.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralExplosives.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralFuelTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralFuelTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralFuelTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralFuelTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralHelicopterUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralHelicopterUnarmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralLightMachineGun.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralLightMachineGun.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralLightMachineGun.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralLightMachineGun.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralLightMachineGunAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralLightMachineGunAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralLightMachineGunAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralLightMachineGunAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralMedicalSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralMedicalSupplies.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralMedicalSupplies.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralMedicalSupplies.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralMilitaryUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralMilitaryUnarmed.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPackagedFood.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPackagedFood.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPackagedFood.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPackagedFood.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPistolAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPistolAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPistolAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPistolAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPistols.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPistols.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralPistols.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralPistols.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralShotgunsandSingleshot.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralShotgunsandSingleshot.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralShotgunsandSingleshotAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralShotgunsandSingleshotAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSmokeGrenades.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSmokeGrenades.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSmokeGrenades.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSmokeGrenades.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSniperRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSniperRifle.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSniperRifle.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSniperRifle.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSniperRifleAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSniperRifleAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSubmachineGunAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSubmachineGunAmmo.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSubmachineGunAmmo.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSubmachineGunAmmo.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSubmachineGuns.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSubmachineGuns.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralSubmachineGuns.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralSubmachineGuns.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralToolbeltItems.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralToolbeltItems.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralToolbeltItems.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralToolbeltItems.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralTrucks.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralTrucks.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralTrucks.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralUsedCars.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralUsedCars.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralUsedCars.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralUsedCars.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralUtilityVehicles.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralUtilityVehicles.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralUtilityVehicles.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralUtilityVehicles.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralVehicleParts.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralVehicleParts.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralVehicleParts.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralVehicleParts.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralWholesale.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralWholesale.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTraderCategories/NeutralWholesale.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralWholesale.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderBandit.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderBandit.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderCategory.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderCategory.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTrader/TraderCategory.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderCategory.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderFriendly.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderFriendly.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderHero.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderHero.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderNeutral.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp
rename to SQF/dayz_code/Configs/CfgServerTrader/Trader/TraderNeutral.hpp
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/cfgServerTrader.hpp b/SQF/dayz_code/Configs/CfgServerTrader/cfgServerTrader.hpp
new file mode 100644
index 000000000..95b3e190c
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgServerTrader/cfgServerTrader.hpp
@@ -0,0 +1,92 @@
+class CfgServerTrader {
+	#include "Trader\TraderHero.hpp"
+	#include "Trader\TraderFriendly.hpp"
+	#include "Trader\TraderNeutral.hpp"
+	#include "Trader\TraderBandit.hpp"
+};
+
+class CfgTraderCategory {
+	#include "Category\BanditAmmunition.hpp"
+	#include "Category\BanditClothing.hpp"
+	#include "Category\BanditHelicopterArmed.hpp"
+	#include "Category\BanditMilitaryArmed.hpp"
+	#include "Category\BanditTrucksArmed.hpp"
+	#include "Category\BanditWeapons.hpp"
+	#include "Category\FriendlyAssaultRifle.hpp"
+	#include "Category\FriendlyAssaultRifleAmmo.hpp"
+	#include "Category\FriendlyBackpacks.hpp"
+	#include "Category\FriendlyBikesandATV.hpp"
+	#include "Category\FriendlyBuildingSupplies.hpp"
+	#include "Category\FriendlyBusesandVans.hpp"
+	#include "Category\FriendlyCargoTrucks.hpp"
+	#include "Category\FriendlyChemlitesFlares.hpp"
+	#include "Category\FriendlyClothes.hpp"
+	#include "Category\FriendlyCookedMeats.hpp"
+	#include "Category\FriendlyDrinks.hpp"
+	#include "Category\FriendlyFuelTrucks.hpp"
+	#include "Category\FriendlyLightMachineGun.hpp"
+	#include "Category\FriendlyLightMachineGunAmmo.hpp"
+	#include "Category\FriendlyMedicalSupplies.hpp"
+	#include "Category\FriendlyMilitaryUnarmed.hpp"
+	#include "Category\FriendlyPackagedFood.hpp"
+	#include "Category\FriendlyPistolAmmo.hpp"
+	#include "Category\FriendlyPistols.hpp"
+	#include "Category\FriendlyShotgunsandSingleshot.hpp"
+	#include "Category\FriendlyShotgunsandSingleshotAmmo.hpp"
+	#include "Category\FriendlySmokeGrenades.hpp"
+	#include "Category\FriendlySniperRifle.hpp"
+	#include "Category\FriendlySniperRifleAmmo.hpp"
+	#include "Category\FriendlySubmachineGunAmmo.hpp"
+	#include "Category\FriendlySubmachineGuns.hpp"
+	#include "Category\FriendlyToolbeltItems.hpp"
+	#include "Category\FriendlyTrucks.hpp"
+	#include "Category\FriendlyTrucksUnarmed.hpp"
+	#include "Category\FriendlyUsedCars.hpp"
+	#include "Category\FriendlyUtilityVehicles.hpp"
+	#include "Category\FriendlyVehicleParts.hpp"
+	#include "Category\HeroAmmunition.hpp"
+	#include "Category\HeroClothes.hpp"
+	#include "Category\HeroHelicopterArmed.hpp"
+	#include "Category\HeroMilitaryArmed.hpp"
+	#include "Category\HeroTrucksArmed.hpp"
+	#include "Category\HeroWeapons.hpp"
+	#include "Category\NeutralAirplanes.hpp"
+	#include "Category\NeutralAssaultRifle.hpp"
+	#include "Category\NeutralAssaultRifleAmmo.hpp"
+	#include "Category\NeutralBackpacks.hpp"
+	#include "Category\NeutralBikesandATV.hpp"
+	#include "Category\NeutralBlackMarketAmmo.hpp"
+	#include "Category\NeutralBlackMarketWeapons.hpp"
+	#include "Category\NeutralBoatsArmed.hpp"
+	#include "Category\NeutralBoatsUnarmed.hpp"
+	#include "Category\NeutralBuildingSupplies.hpp"
+	#include "Category\NeutralBusesandVans.hpp"
+	#include "Category\NeutralCargoTrucks.hpp"
+	#include "Category\NeutralChemlitesFlares.hpp"
+	#include "Category\NeutralClothes.hpp"
+	#include "Category\NeutralCookedMeats.hpp"
+	#include "Category\NeutralDrinks.hpp"
+	#include "Category\NeutralExplosives.hpp"
+	#include "Category\NeutralFuelTrucks.hpp"
+	#include "Category\NeutralHelicopterUnarmed.hpp"
+	#include "Category\NeutralLightMachineGun.hpp"
+	#include "Category\NeutralLightMachineGunAmmo.hpp"
+	#include "Category\NeutralMedicalSupplies.hpp"
+	#include "Category\NeutralMilitaryUnarmed.hpp"
+	#include "Category\NeutralPackagedFood.hpp"
+	#include "Category\NeutralPistolAmmo.hpp"
+	#include "Category\NeutralPistols.hpp"
+	#include "Category\NeutralShotgunsandSingleshot.hpp"
+	#include "Category\NeutralShotgunsandSingleshotAmmo.hpp"
+	#include "Category\NeutralSmokeGrenades.hpp"
+	#include "Category\NeutralSniperRifle.hpp"
+	#include "Category\NeutralSniperRifleAmmo.hpp"
+	#include "Category\NeutralSubmachineGunAmmo.hpp"
+	#include "Category\NeutralSubmachineGuns.hpp"
+	#include "Category\NeutralToolbeltItems.hpp"
+	#include "Category\NeutralTrucks.hpp"
+	#include "Category\NeutralUsedCars.hpp"
+	#include "Category\NeutralUtilityVehicles.hpp"
+	#include "Category\NeutralVehicleParts.hpp"
+	#include "Category\NeutralWholesale.hpp"
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/cfgServerTrader.hpp b/SQF/dayz_code/Configs/cfgServerTrader.hpp
deleted file mode 100644
index ba826dfbc..000000000
--- a/SQF/dayz_code/Configs/cfgServerTrader.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class CfgServerTrader {
-	#include "CfgServerTrader\TraderHero.hpp"
-	#include "CfgServerTrader\TraderFriendly.hpp"
-	#include "CfgServerTrader\TraderNeutral.hpp"
-	#include "CfgServerTrader\TraderBandit.hpp"
-};
-
-class CfgTraderCategory {
-	#include "CfgTraderCategory\HeroAmmunition.hpp"
-};
\ No newline at end of file