diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
index 193c2e3647907..a013d2736c621 100644
--- a/data/json/itemgroups/ammo.json
+++ b/data/json/itemgroups/ammo.json
@@ -428,6 +428,33 @@
       [ "300blk_casing", 80 ]
     ]
   },
+  {
+    "id": "casings",
+    "//": "casings list for shooting range.",
+    "type": "item_group",
+    "items": [
+      [ "9mm_casing", 100 ],
+      [ "22_casing", 95 ],
+      [ "38_casing", 75 ],
+      [ "40_casing", 80 ],
+      [ "44_casing", 35 ],
+      [ "45_casing", 65 ],
+      [ "454_casing", 10 ],
+      [ "500_casing", 10 ],
+      [ "57mm_casing", 10 ],
+      [ "46mm_casing", 10 ],
+      [ "762_casing", 85 ],
+      [ "762_51_casing", 50 ],
+      [ "223_casing", 85 ],
+      [ "3006_casing", 40 ],
+      [ "308_casing", 50 ],
+      [ "50_casing", 30 ],
+      [ "700nx_casing", 10 ],
+      [ "300_casing", 60 ],
+      [ "762R_casing", 10 ],
+      [ "32_casing", 70 ]
+    ]
+  },
   {
     "id": "ammo_casings_bulk",
     "type": "item_group",
diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
new file mode 100644
index 0000000000000..0beed9d1f863b
--- /dev/null
+++ b/data/json/itemgroups/electronics.json
@@ -0,0 +1,105 @@
+[
+  {
+    "type": "item_group",
+    "id": "electronics",
+    "items": [
+      [ "voltmeter", 10 ],
+      [ "jumper_cable_heavy", 10 ],
+      [ "superglue", 30 ],
+      [ "electrohack", 3 ],
+      [ "processor", 15 ],
+      [ "RAM", 22 ],
+      [ "power_supply", 16 ],
+      [ "amplifier", 8 ],
+      [ "transponder", 5 ],
+      [ "receiver", 10 ],
+      [ "antenna", 18 ],
+      [ "solar_cell", 5 ],
+      [ "screwdriver", 40 ],
+      [ "screwdriver_set", 40 ],
+      [ "mask_dust", 65 ],
+      [ "glasses_safety", 40 ],
+      [ "goggles_welding", 70 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
+      [ "plut_cell", 10 ],
+      [ "manual_electronics", 20 ],
+      [ "textbook_electronics", 6 ],
+      [ "radio_book", 16 ],
+      [ "advanced_electronics", 6 ],
+      [ "small_lcd_screen", 20 ],
+      [ "double_plutonium_core", 2 ],
+      [ "battery_ups", 15 ],
+      [ "cell_phone", 15 ],
+      [ "smart_phone", 20 ],
+      [ "eink_tablet_pc", 8 ],
+      [ "smart_lamp", 5 ],
+      [ "mobile_memory_card", 20 ],
+      [ "camera", 5 ],
+      [ "camera_pro", 2 ],
+      [ "cable", 30 ],
+      [ "soldering_iron", 70 ],
+      [ "solder_wire", 70 ],
+      [ "hotplate", 10 ],
+      [ "UPS_off", 5 ],
+      [ "usb_drive", 5 ],
+      [ "software_useless", 10 ],
+      [ "vac_sealer", 10 ],
+      [ "radio_car_box", 3 ],
+      [ "radiocontrol", 25 ],
+      [ "omnicamera", 7 ],
+      [ "chem_nitric_acid", 1 ],
+      [ "l-stick", 1 ],
+      [ "solarpack", 10 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "ammo": 25,
+    "magazine": 100,
+    "id": "consumer_electronics",
+    "items": [
+      [ "amplifier", 8 ],
+      [ "mag_electronics", 15 ],
+      [ "antenna", 18 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
+      [ "soldering_iron", 70 ],
+      [ "solder_wire", 70 ],
+      [ "solar_cell", 5 ],
+      [ "screwdriver", 40 ],
+      [ "screwdriver_set", 40 ],
+      [ "processor", 15 ],
+      [ "RAM", 22 ],
+      [ "mp3", 18 ],
+      [ "portable_game", 12 ],
+      [ "game_watch", 3 ],
+      [ "vibrator", 10 ],
+      [ "flashlight", 40 ],
+      [ "heavy_flashlight", 10 ],
+      [ "radio", 20 ],
+      [ "mess_kit", 5 ],
+      [ "hotplate", 10 ],
+      [ "coffeemaker", 10 ],
+      [ "receiver", 10 ],
+      [ "transponder", 5 ],
+      [ "tazer", 3 ],
+      [ "usb_drive", 5 ],
+      [ "manual_electronics", 20 ],
+      [ "recipe_augs", 4 ],
+      [ "cable", 60 ],
+      [ "vac_sealer", 10 ],
+      [ "smart_phone", 50 ],
+      [ "eink_tablet_pc", 15 ],
+      [ "smart_lamp", 10 ],
+      [ "mobile_memory_card", 40 ],
+      [ "camera", 15 ],
+      [ "camera_pro", 5 ],
+      [ "wristwatch", 15 ],
+      [ "radio_car_box", 3 ],
+      [ "radiocontrol", 15 ],
+      [ "magnifying_glass", 4 ],
+      [ "omnicamera", 2 ],
+      [ "l-stick", 1 ],
+      [ "reading_light", 6 ]
+    ]
+  }
+]
diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
index 86e4992c6b59c..352dde359b835 100644
--- a/data/json/itemgroups/food.json
+++ b/data/json/itemgroups/food.json
@@ -678,5 +678,60 @@
       [ "knife_steak", 45 ],
       [ "tongs", 60 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "fast_food",
+    "items": [
+      { "group": "candy_chocolate", "prob": 480 },
+      { "group": "softdrinks_canned", "prob": 480 },
+      [ "water_clean", 90 ],
+      [ "sandwich_t", 30 ],
+      [ "sandwich_pb", 30 ],
+      [ "sandwich_pbj", 30 ],
+      [ "sandwich_pbh", 30 ],
+      [ "sandwich_pbm", 30 ],
+      [ "pizza_veggy", 8 ],
+      [ "pizza_cheese", 8 ],
+      [ "pizza_meat", 8 ],
+      [ "pie", 20 ],
+      [ "pie_meat", 20 ],
+      [ "pie_veggy", 20 ],
+      [ "pie_maple", 10 ],
+      [ "chips", 65 ],
+      [ "fried_seeds", 25 ],
+      [ "cookies", 60 ],
+      [ "mayonnaise", 60 ],
+      [ "spork", 10 ],
+      [ "foon", 10 ],
+      [ "ketchup", 60 ],
+      [ "mustard", 60 ],
+      [ "soysauce", 45 ],
+      [ "horseradish", 30 ],
+      { "item": "pickle", "prob": 40, "charges": 6, "container-item": "jar_glass_sealed" },
+      [ "salt", 20 ],
+      [ "pepper", 20 ],
+      [ "meat_smoked", 4 ],
+      [ "fish_smoked", 4 ],
+      [ "cheeseburger", 35 ],
+      [ "hotdogs_frozen", 12 ],
+      [ "hotdogs_cooked", 35 ],
+      [ "chili", 20 ],
+      [ "chilidogs", 20 ],
+      [ "fries", 80 ],
+      [ "cheese_fries", 70 ],
+      [ "onion_rings", 80 ],
+      [ "hamburger", 30 ],
+      [ "fish_fried", 8 ],
+      [ "fish_sandwich", 8 ],
+      [ "tofu_rice", 4 ],
+      [ "sloppyjoe", 8 ],
+      [ "bacon", 25 ],
+      [ "cheese", 30 ],
+      [ "restaurantmap", 5 ],
+      [ "touristmap", 2 ],
+      [ "noodles_fast", 30 ],
+      [ "milkshake_fastfood", 15 ]
+    ]
   }
 ]
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index 3ac59eb3d5c5e..b2d3573366429 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -812,61 +812,6 @@
       { "group": "tinware", "prob": 10 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "fast_food",
-    "items": [
-      { "group": "candy_chocolate", "prob": 480 },
-      { "group": "softdrinks_canned", "prob": 480 },
-      [ "water_clean", 90 ],
-      [ "sandwich_t", 30 ],
-      [ "sandwich_pb", 30 ],
-      [ "sandwich_pbj", 30 ],
-      [ "sandwich_pbh", 30 ],
-      [ "sandwich_pbm", 30 ],
-      [ "pizza_veggy", 8 ],
-      [ "pizza_cheese", 8 ],
-      [ "pizza_meat", 8 ],
-      [ "pie", 20 ],
-      [ "pie_meat", 20 ],
-      [ "pie_veggy", 20 ],
-      [ "pie_maple", 10 ],
-      [ "chips", 65 ],
-      [ "fried_seeds", 25 ],
-      [ "cookies", 60 ],
-      [ "mayonnaise", 60 ],
-      [ "spork", 10 ],
-      [ "foon", 10 ],
-      [ "ketchup", 60 ],
-      [ "mustard", 60 ],
-      [ "soysauce", 45 ],
-      [ "horseradish", 30 ],
-      { "item": "pickle", "prob": 40, "charges": 6, "container-item": "jar_glass_sealed" },
-      [ "salt", 20 ],
-      [ "pepper", 20 ],
-      [ "meat_smoked", 4 ],
-      [ "fish_smoked", 4 ],
-      [ "cheeseburger", 35 ],
-      [ "hotdogs_frozen", 12 ],
-      [ "hotdogs_cooked", 35 ],
-      [ "chili", 20 ],
-      [ "chilidogs", 20 ],
-      [ "fries", 80 ],
-      [ "cheese_fries", 70 ],
-      [ "onion_rings", 80 ],
-      [ "hamburger", 30 ],
-      [ "fish_fried", 8 ],
-      [ "fish_sandwich", 8 ],
-      [ "tofu_rice", 4 ],
-      [ "sloppyjoe", 8 ],
-      [ "bacon", 25 ],
-      [ "cheese", 30 ],
-      [ "restaurantmap", 5 ],
-      [ "touristmap", 2 ],
-      [ "noodles_fast", 30 ],
-      [ "milkshake_fastfood", 15 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "softdrugs",
@@ -964,56 +909,6 @@
       [ "toilet_paper", 10 ]
     ]
   },
-  {
-    "type": "item_group",
-    "ammo": 25,
-    "magazine": 100,
-    "id": "consumer_electronics",
-    "items": [
-      [ "amplifier", 8 ],
-      [ "mag_electronics", 15 ],
-      [ "antenna", 18 ],
-      { "group": "ammo_any_batteries_full", "prob": 50 },
-      [ "soldering_iron", 70 ],
-      [ "solder_wire", 70 ],
-      [ "solar_cell", 5 ],
-      [ "screwdriver", 40 ],
-      [ "screwdriver_set", 40 ],
-      [ "processor", 15 ],
-      [ "RAM", 22 ],
-      [ "mp3", 18 ],
-      [ "portable_game", 12 ],
-      [ "game_watch", 3 ],
-      [ "vibrator", 10 ],
-      [ "flashlight", 40 ],
-      [ "heavy_flashlight", 10 ],
-      [ "radio", 20 ],
-      [ "mess_kit", 5 ],
-      [ "hotplate", 10 ],
-      [ "coffeemaker", 10 ],
-      [ "receiver", 10 ],
-      [ "transponder", 5 ],
-      [ "tazer", 3 ],
-      [ "usb_drive", 5 ],
-      [ "manual_electronics", 20 ],
-      [ "recipe_augs", 4 ],
-      [ "cable", 60 ],
-      [ "vac_sealer", 10 ],
-      [ "smart_phone", 50 ],
-      [ "eink_tablet_pc", 15 ],
-      [ "smart_lamp", 10 ],
-      [ "mobile_memory_card", 40 ],
-      [ "camera", 15 ],
-      [ "camera_pro", 5 ],
-      [ "wristwatch", 15 ],
-      [ "radio_car_box", 3 ],
-      [ "radiocontrol", 15 ],
-      [ "magnifying_glass", 4 ],
-      [ "omnicamera", 2 ],
-      [ "l-stick", 1 ],
-      [ "reading_light", 6 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "pool_table",
@@ -1326,74 +1221,6 @@
       [ "test_tube", 10 ]
     ]
   },
-  {
-    "type": "item_group",
-    "id": "electronics",
-    "items": [
-      [ "voltmeter", 10 ],
-      [ "jumper_cable_heavy", 10 ],
-      [ "superglue", 30 ],
-      [ "electrohack", 3 ],
-      [ "processor", 15 ],
-      [ "RAM", 22 ],
-      [ "power_supply", 16 ],
-      [ "amplifier", 8 ],
-      [ "transponder", 5 ],
-      [ "receiver", 10 ],
-      [ "antenna", 18 ],
-      [ "solar_cell", 5 ],
-      [ "screwdriver", 40 ],
-      [ "screwdriver_set", 40 ],
-      [ "mask_dust", 65 ],
-      [ "glasses_safety", 40 ],
-      [ "goggles_welding", 70 ],
-      { "group": "ammo_any_batteries_full", "prob": 50 },
-      [ "plut_cell", 10 ],
-      [ "manual_electronics", 20 ],
-      [ "textbook_electronics", 6 ],
-      [ "radio_book", 16 ],
-      [ "advanced_electronics", 6 ],
-      [ "small_lcd_screen", 20 ],
-      [ "double_plutonium_core", 2 ],
-      [ "battery_ups", 15 ],
-      [ "cell_phone", 15 ],
-      [ "smart_phone", 20 ],
-      [ "eink_tablet_pc", 8 ],
-      [ "smart_lamp", 5 ],
-      [ "mobile_memory_card", 20 ],
-      [ "camera", 5 ],
-      [ "camera_pro", 2 ],
-      [ "cable", 30 ],
-      [ "soldering_iron", 70 ],
-      [ "solder_wire", 70 ],
-      [ "hotplate", 10 ],
-      [ "UPS_off", 5 ],
-      [ "usb_drive", 5 ],
-      [ "software_useless", 10 ],
-      [ "vac_sealer", 10 ],
-      [ "radio_car_box", 3 ],
-      [ "radiocontrol", 25 ],
-      [ "omnicamera", 7 ],
-      [ "chem_nitric_acid", 1 ],
-      [ "l-stick", 1 ],
-      [ "solarpack", 10 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "monparts",
-    "items": [
-      [ "meat", 50 ],
-      [ "veggy", 30 ],
-      [ "meat_tainted", 60 ],
-      [ "veggy_tainted", 35 ],
-      [ "royal_jelly", 8 ],
-      [ "ant_egg", 5 ],
-      [ "bee_sting", 5 ],
-      [ "fighter_sting", 5 ],
-      [ "chitin_piece", 10 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "grenades",
@@ -1509,91 +1336,6 @@
       [ "weather_reader", 1 ]
     ]
   },
-  {
-    "type": "item_group",
-    "id": "ant_food",
-    "items": [
-      [ "meat", 50 ],
-      [ "veggy", 30 ],
-      [ "meat_tainted", 60 ],
-      [ "veggy_tainted", 35 ],
-      [ "apple", 70 ],
-      [ "orange", 65 ],
-      [ "banana", 40 ],
-      [ "mushroom", 4 ],
-      [ "blueberries", 3 ],
-      [ "strawberries", 2 ],
-      [ "cucumber", 8 ],
-      [ "tomato", 9 ],
-      [ "pumpkin", 8 ],
-      [ "broccoli", 9 ],
-      [ "zucchini", 7 ],
-      [ "celery", 2 ],
-      [ "onion", 3 ],
-      [ "carrot", 3 ],
-      [ "potato", 10 ],
-      [ "pear", 65 ],
-      [ "grapefruit", 1 ],
-      [ "cherries", 5 ],
-      [ "plums", 9 ],
-      [ "grapes", 45 ],
-      [ "pineapple", 2 ],
-      [ "peach", 1 ],
-      [ "cranberries", 15 ],
-      [ "watermelon", 2 ],
-      [ "melon", 1 ],
-      [ "raspberries", 3 ],
-      [ "blackberries", 3 ],
-      [ "mango", 1 ],
-      [ "pomegranate", 1 ],
-      [ "rhubarb", 5 ],
-      [ "papaya", 1 ],
-      [ "kiwi", 2 ],
-      [ "apricot", 1 ],
-      [ "honeycomb", 10 ],
-      [ "royal_jelly", 8 ],
-      [ "arm", 4 ],
-      [ "leg", 4 ],
-      [ "rock", 40 ],
-      [ "stick", 95 ],
-      [ "bio_metabolics", 10 ],
-      [ "survivormap", 1 ],
-      [ "miner_hat", 10 ],
-      [ "honey_ant", 30 ],
-      [ "tool_black_powder_charge", 1 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "razorclaw_nest",
-    "subtype": "distribution",
-    "entries": [ { "item": "razorclaw_roe", "count-min": 1, "count-max": 6 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ant_egg",
-    "items": [ [ "ant_egg", 5 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "biollante",
-    "items": [ [ "biollante_bud", 1 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "bees",
-    "items": [ [ "bee_sting", 5 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "fungal_sting",
-    "items": [ [ "fighter_sting", 5 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "wasps",
-    "items": [ [ "wasp_sting", 5 ] ]
-  },
   {
     "type": "item_group",
     "id": "helicopter",
@@ -2044,42 +1786,6 @@
       [ "spear_dory", 3 ]
     ]
   },
-  {
-    "type": "item_group",
-    "id": "vault_wanderer",
-    "magazine": 100,
-    "ammo": 20,
-    "items": [
-      [ "jumpsuit", 90 ],
-      [ "mask_filter", 10 ],
-      { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      { "item": "radio", "prob": 10, "charges-min": 10, "charges-max": 95 },
-      [ "boots_combat", 20 ],
-      { "item": "bandages", "prob": 10, "charges-min": 1, "charges-max": 3 },
-      { "item": "cig", "prob": 30, "charges-min": 1, "charges-max": 20 },
-      [ "knife_combat", 10 ],
-      [ "vest", 15 ],
-      [ "glasses_safety", 15 ],
-      [ "9mm", 15 ],
-      [ "m9", 10 ],
-      [ "water_clean", 10 ],
-      { "item": "eyedrops", "prob": 10, "charges-min": 1, "charges-max": 10 },
-      [ "screwdriver", 10 ],
-      [ "id_science", 5 ],
-      [ "cleansuit", 10 ],
-      [ "coat_lab", 20 ],
-      [ "glasses_eye", 30 ],
-      { "item": "rad_monitor", "prob": 10, "charges-min": 2, "charges-max": 20 },
-      { "item": "geiger_off", "prob": 10, "charges-min": 10, "charges-max": 95 },
-      [ "tool_belt", 15 ],
-      [ "panties", 20 ],
-      [ "boy_shorts", 20 ],
-      [ "bra", 20 ],
-      [ "undershirt", 40 ],
-      [ "boxer_shorts", 30 ],
-      [ "briefs", 30 ]
-    ]
-  },
   {
     "id": "wheels",
     "type": "item_group",
@@ -2101,32 +1807,6 @@
     "type": "item_group",
     "items": [ [ "wooden_barrel", 30 ], [ "30gal_barrel", 50 ], [ "30gal_drum", 45 ], [ "55gal_drum", 35 ] ]
   },
-  {
-    "id": "casings",
-    "type": "item_group",
-    "items": [
-      [ "9mm_casing", 100 ],
-      [ "22_casing", 95 ],
-      [ "38_casing", 75 ],
-      [ "40_casing", 80 ],
-      [ "44_casing", 35 ],
-      [ "45_casing", 65 ],
-      [ "454_casing", 10 ],
-      [ "500_casing", 10 ],
-      [ "57mm_casing", 10 ],
-      [ "46mm_casing", 10 ],
-      [ "762_casing", 85 ],
-      [ "762_51_casing", 50 ],
-      [ "223_casing", 85 ],
-      [ "3006_casing", 40 ],
-      [ "308_casing", 50 ],
-      [ "50_casing", 30 ],
-      [ "700nx_casing", 10 ],
-      [ "300_casing", 60 ],
-      [ "762R_casing", 10 ],
-      [ "32_casing", 70 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "flower_pots",
@@ -2260,133 +1940,5 @@
     "type": "item_group",
     "id": "meth_ingredients",
     "items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "spider",
-    "magazine": 100,
-    "items": [
-      { "group": "mags_obscure", "prob": 40 },
-      [ "corpse", 10 ],
-      [ "holy_symbol", 1 ],
-      [ "mutagen", 8 ],
-      [ "purifier", 12 ],
-      [ "meat", 50 ],
-      [ "meat_tainted", 60 ],
-      [ "arm", 4 ],
-      [ "leg", 4 ],
-      [ "1st_aid", 35 ],
-      [ "codeine", 15 ],
-      [ "oxycodone", 7 ],
-      [ "pipe_tobacco", 5 ],
-      [ "tobacco", 5 ],
-      [ "weed", 20 ],
-      [ "seed_weed", 15 ],
-      [ "seed_tobacco", 5 ],
-      [ "rolling_paper", 5 ],
-      [ "pipe_glass", 5 ],
-      [ "coke", 8 ],
-      [ "adrenaline_injector", 4 ],
-      [ "wrapper", 50 ],
-      [ "id_science", 2 ],
-      [ "laptop", 5 ],
-      [ "atomic_light", 10 ],
-      [ "atomic_lamp", 5 ],
-      [ "smart_lamp", 10 ],
-      [ "atomic_coffeepot", 5 ],
-      [ "eink_tablet_pc", 1 ],
-      [ "mobile_memory_card", 8 ],
-      [ "mobile_memory_card_science", 1 ],
-      [ "standard_template_construct", 8 ],
-      [ "id_military", 3 ],
-      [ "id_industrial", 5 ],
-      [ "militarymap", 3 ],
-      [ "pistol_bayonet", 4 ],
-      [ "rope_30", 35 ],
-      [ "stick", 95 ],
-      [ "hatchet", 10 ],
-      [ "misc_repairkit", 5 ],
-      [ "ax", 8 ],
-      [ "bee_sting", 5 ],
-      [ "chitin_piece", 10 ],
-      [ "lwfeed", 40 ],
-      [ "vest", 15 ],
-      [ "mask_gas", 10 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 1 ],
-      [ "hat_boonie", 10 ],
-      [ "helmet_riot", 25 ],
-      [ "bolt_steel", 7 ],
-      [ "bolt_cf", 5 ],
-      [ "shot_00", 8 ],
-      [ "shot_flechette", 3 ],
-      [ "20x66_shot", 4 ],
-      [ "20x66_exp", 1 ],
-      [ "20x66_inc", 1 ],
-      [ "20x66_flare", 2 ],
-      [ "20x66_frag", 1 ],
-      [ "762_m87", 7 ],
-      [ "556", 6 ],
-      [ "556_incendiary", 2 ],
-      [ "3006_incendiary", 1 ],
-      [ "762_51", 6 ],
-      [ "762_51_incendiary", 6 ],
-      [ "saiga_12", 3 ],
-      [ "rm20", 1 ],
-      [ "hk_mp5", 12 ],
-      [ "hk_mp5k", 4 ],
-      [ "briefcase_smg", 1 ],
-      [ "TDI", 4 ],
-      [ "savage_111f", 10 ],
-      [ "ak47", 16 ],
-      [ "ak74", 4 ],
-      [ "an94", 1 ],
-      [ "m4a1", 7 ],
-      [ "m16a4", 6 ],
-      [ "h&k416a5", 3 ],
-      [ "m1014", 1 ],
-      [ "steyr_aug", 6 ],
-      [ "v29", 1 ],
-      [ "flamethrower", 1 ],
-      [ "flashlight", 40 ],
-      [ "radio", 20 ],
-      [ "geiger_off", 8 ],
-      [ "rad_monitor", 4 ],
-      [ "teleporter", 10 ],
-      [ "mil_mess_kit", 1 ],
-      [ "canister_goo", 8 ],
-      [ "dynamite", 5 ],
-      [ "mininuke", 1 ],
-      [ "bot_manhack", 1 ],
-      [ "bot_grenade_hack", 1 ],
-      [ "bot_flashbang_hack", 1 ],
-      [ "bot_gasbomb_hack", 1 ],
-      [ "UPS_off", 5 ],
-      [ "adv_UPS_off", 3 ],
-      [ "bio_power_storage", 10 ],
-      [ "bio_flashlight", 10 ],
-      [ "bio_lighter", 10 ],
-      [ "bio_shotgun", 10 ],
-      [ "arrow_cf", 5 ],
-      [ "spray_can", 50 ],
-      [ "tac_helmet", 5 ],
-      [ "tac_fullhelmet", 2 ],
-      [ "helmet_lobster", 2 ],
-      [ "lsd", 4 ],
-      [ "pocketwatch", 5 ],
-      [ "child_book", 20 ],
-      [ "manual_dodge_kid", 5 ],
-      [ "e_tool", 10 ],
-      [ "survivormap", 5 ],
-      [ "halligan", 10 ],
-      [ "fire_ax", 5 ],
-      [ "miner_hat", 10 ],
-      [ "grapnel", 2 ],
-      [ "toolbox", 1 ],
-      [ "pur_tablets", 10 ],
-      [ "pastaextruder", 10 ],
-      [ "can_sealer", 10 ],
-      [ "remotevehcontrol", 8 ]
-    ]
   }
 ]
diff --git a/data/json/itemgroups/monster_drops.json b/data/json/itemgroups/monster_drops.json
deleted file mode 100644
index b6e6cf7083501..0000000000000
--- a/data/json/itemgroups/monster_drops.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "type": "item_group",
-    "id": "shia_stuff",
-    "items": [ [ "knife_steak", 3 ], [ "ax", 1 ] ]
-  }
-]
diff --git a/data/json/itemgroups/monster_drops_lairs.json b/data/json/itemgroups/monster_drops_lairs.json
new file mode 100644
index 0000000000000..12e93d8632047
--- /dev/null
+++ b/data/json/itemgroups/monster_drops_lairs.json
@@ -0,0 +1,271 @@
+[
+  {
+    "type": "item_group",
+    "id": "shia_stuff",
+    "items": [ [ "knife_steak", 3 ], [ "ax", 1 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "monparts",
+    "items": [
+      [ "meat", 50 ],
+      [ "veggy", 30 ],
+      [ "meat_tainted", 60 ],
+      [ "veggy_tainted", 35 ],
+      [ "royal_jelly", 8 ],
+      [ "ant_egg", 5 ],
+      [ "bee_sting", 5 ],
+      [ "fighter_sting", 5 ],
+      [ "chitin_piece", 10 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ant_food",
+    "items": [
+      [ "meat", 50 ],
+      [ "veggy", 30 ],
+      [ "meat_tainted", 60 ],
+      [ "veggy_tainted", 35 ],
+      [ "apple", 70 ],
+      [ "orange", 65 ],
+      [ "banana", 40 ],
+      [ "mushroom", 4 ],
+      [ "blueberries", 3 ],
+      [ "strawberries", 2 ],
+      [ "cucumber", 8 ],
+      [ "tomato", 9 ],
+      [ "pumpkin", 8 ],
+      [ "broccoli", 9 ],
+      [ "zucchini", 7 ],
+      [ "celery", 2 ],
+      [ "onion", 3 ],
+      [ "carrot", 3 ],
+      [ "potato", 10 ],
+      [ "pear", 65 ],
+      [ "grapefruit", 1 ],
+      [ "cherries", 5 ],
+      [ "plums", 9 ],
+      [ "grapes", 45 ],
+      [ "pineapple", 2 ],
+      [ "peach", 1 ],
+      [ "cranberries", 15 ],
+      [ "watermelon", 2 ],
+      [ "melon", 1 ],
+      [ "raspberries", 3 ],
+      [ "blackberries", 3 ],
+      [ "mango", 1 ],
+      [ "pomegranate", 1 ],
+      [ "rhubarb", 5 ],
+      [ "papaya", 1 ],
+      [ "kiwi", 2 ],
+      [ "apricot", 1 ],
+      [ "honeycomb", 10 ],
+      [ "royal_jelly", 8 ],
+      [ "arm", 4 ],
+      [ "leg", 4 ],
+      [ "rock", 40 ],
+      [ "stick", 95 ],
+      [ "bio_metabolics", 10 ],
+      [ "survivormap", 1 ],
+      [ "miner_hat", 10 ],
+      [ "honey_ant", 30 ],
+      [ "tool_black_powder_charge", 1 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "razorclaw_nest",
+    "subtype": "distribution",
+    "entries": [ { "item": "razorclaw_roe", "count-min": 1, "count-max": 6 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "ant_egg",
+    "items": [ [ "ant_egg", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "biollante",
+    "items": [ [ "biollante_bud", 1 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "bees",
+    "items": [ [ "bee_sting", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "fungal_sting",
+    "items": [ [ "fighter_sting", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "wasps",
+    "items": [ [ "wasp_sting", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "vault_wanderer",
+    "magazine": 100,
+    "ammo": 20,
+    "items": [
+      [ "jumpsuit", 90 ],
+      [ "mask_filter", 10 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 10 },
+      { "item": "radio", "prob": 10, "charges-min": 10, "charges-max": 95 },
+      [ "boots_combat", 20 ],
+      { "item": "bandages", "prob": 10, "charges-min": 1, "charges-max": 3 },
+      { "item": "cig", "prob": 30, "charges-min": 1, "charges-max": 20 },
+      [ "knife_combat", 10 ],
+      [ "vest", 15 ],
+      [ "glasses_safety", 15 ],
+      [ "9mm", 15 ],
+      [ "m9", 10 ],
+      [ "water_clean", 10 ],
+      { "item": "eyedrops", "prob": 10, "charges-min": 1, "charges-max": 10 },
+      [ "screwdriver", 10 ],
+      [ "id_science", 5 ],
+      [ "cleansuit", 10 ],
+      [ "coat_lab", 20 ],
+      [ "glasses_eye", 30 ],
+      { "item": "rad_monitor", "prob": 10, "charges-min": 2, "charges-max": 20 },
+      { "item": "geiger_off", "prob": 10, "charges-min": 10, "charges-max": 95 },
+      [ "tool_belt", 15 ],
+      [ "panties", 20 ],
+      [ "boy_shorts", 20 ],
+      [ "bra", 20 ],
+      [ "undershirt", 40 ],
+      [ "boxer_shorts", 30 ],
+      [ "briefs", 30 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "spider",
+    "magazine": 100,
+    "items": [
+      { "group": "mags_obscure", "prob": 40 },
+      [ "corpse", 10 ],
+      [ "holy_symbol", 1 ],
+      [ "mutagen", 8 ],
+      [ "purifier", 12 ],
+      [ "meat", 50 ],
+      [ "meat_tainted", 60 ],
+      [ "arm", 4 ],
+      [ "leg", 4 ],
+      [ "1st_aid", 35 ],
+      [ "codeine", 15 ],
+      [ "oxycodone", 7 ],
+      [ "pipe_tobacco", 5 ],
+      [ "tobacco", 5 ],
+      [ "weed", 20 ],
+      [ "seed_weed", 15 ],
+      [ "seed_tobacco", 5 ],
+      [ "rolling_paper", 5 ],
+      [ "pipe_glass", 5 ],
+      [ "coke", 8 ],
+      [ "adrenaline_injector", 4 ],
+      [ "wrapper", 50 ],
+      [ "id_science", 2 ],
+      [ "laptop", 5 ],
+      [ "atomic_light", 10 ],
+      [ "atomic_lamp", 5 ],
+      [ "smart_lamp", 10 ],
+      [ "atomic_coffeepot", 5 ],
+      [ "eink_tablet_pc", 1 ],
+      [ "mobile_memory_card", 8 ],
+      [ "mobile_memory_card_science", 1 ],
+      [ "standard_template_construct", 8 ],
+      [ "id_military", 3 ],
+      [ "id_industrial", 5 ],
+      [ "militarymap", 3 ],
+      [ "pistol_bayonet", 4 ],
+      [ "rope_30", 35 ],
+      [ "stick", 95 ],
+      [ "hatchet", 10 ],
+      [ "misc_repairkit", 5 ],
+      [ "ax", 8 ],
+      [ "bee_sting", 5 ],
+      [ "chitin_piece", 10 ],
+      [ "lwfeed", 40 ],
+      [ "vest", 15 ],
+      [ "mask_gas", 10 ],
+      [ "goggles_nv", 1 ],
+      [ "goggles_ir", 1 ],
+      [ "hat_boonie", 10 ],
+      [ "helmet_riot", 25 ],
+      [ "bolt_steel", 7 ],
+      [ "bolt_cf", 5 ],
+      [ "shot_00", 8 ],
+      [ "shot_flechette", 3 ],
+      [ "20x66_shot", 4 ],
+      [ "20x66_exp", 1 ],
+      [ "20x66_inc", 1 ],
+      [ "20x66_flare", 2 ],
+      [ "20x66_frag", 1 ],
+      [ "762_m87", 7 ],
+      [ "556", 6 ],
+      [ "556_incendiary", 2 ],
+      [ "3006_incendiary", 1 ],
+      [ "762_51", 6 ],
+      [ "762_51_incendiary", 6 ],
+      [ "saiga_12", 3 ],
+      [ "rm20", 1 ],
+      [ "hk_mp5", 12 ],
+      [ "hk_mp5k", 4 ],
+      [ "briefcase_smg", 1 ],
+      [ "TDI", 4 ],
+      [ "savage_111f", 10 ],
+      [ "ak47", 16 ],
+      [ "ak74", 4 ],
+      [ "an94", 1 ],
+      [ "m4a1", 7 ],
+      [ "m16a4", 6 ],
+      [ "h&k416a5", 3 ],
+      [ "m1014", 1 ],
+      [ "steyr_aug", 6 ],
+      [ "v29", 1 ],
+      [ "flamethrower", 1 ],
+      [ "flashlight", 40 ],
+      [ "radio", 20 ],
+      [ "geiger_off", 8 ],
+      [ "rad_monitor", 4 ],
+      [ "teleporter", 10 ],
+      [ "mil_mess_kit", 1 ],
+      [ "canister_goo", 8 ],
+      [ "dynamite", 5 ],
+      [ "mininuke", 1 ],
+      [ "bot_manhack", 1 ],
+      [ "bot_grenade_hack", 1 ],
+      [ "bot_flashbang_hack", 1 ],
+      [ "bot_gasbomb_hack", 1 ],
+      [ "UPS_off", 5 ],
+      [ "adv_UPS_off", 3 ],
+      [ "bio_power_storage", 10 ],
+      [ "bio_flashlight", 10 ],
+      [ "bio_lighter", 10 ],
+      [ "bio_shotgun", 10 ],
+      [ "arrow_cf", 5 ],
+      [ "spray_can", 50 ],
+      [ "tac_helmet", 5 ],
+      [ "tac_fullhelmet", 2 ],
+      [ "helmet_lobster", 2 ],
+      [ "lsd", 4 ],
+      [ "pocketwatch", 5 ],
+      [ "child_book", 20 ],
+      [ "manual_dodge_kid", 5 ],
+      [ "e_tool", 10 ],
+      [ "survivormap", 5 ],
+      [ "halligan", 10 ],
+      [ "fire_ax", 5 ],
+      [ "miner_hat", 10 ],
+      [ "grapnel", 2 ],
+      [ "toolbox", 1 ],
+      [ "pur_tablets", 10 ],
+      [ "pastaextruder", 10 ],
+      [ "can_sealer", 10 ],
+      [ "remotevehcontrol", 8 ]
+    ]
+  }
+]