diff --git a/gulpfile.mjs b/gulpfile.mjs
index 314b7354..cf19c161 100644
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@@ -112,10 +112,17 @@ async function prepareDB() {
         convert("./src/packs/_source/vorteile", "./src/packs/__source/vorteile", "Advantage");
         convert("./src/packs/_source/nachteile", "./src/packs/__source/vorteile", "Advantage", false);
         convert("./src/packs/_source/sonderfertigkeiten", "./src/packs/__source/sonderfertigkeiten", "SpecialAbility");
-        convert("./src/packs/_source/waffen", "./src/packs/__source/waffen", "Equipment");
         convert("./src/packs/_source/waehrungen", "./src/packs/__source/waehrungen", "Equipment");
-        convert("./src/packs/_source/munition", "./src/packs/__source/munition", "Equipment");
-        convert("./src/packs/_source/ruestzeug", "./src/packs/__source/ruestzeug", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Waffen", "./src/packs/__source/Waffen", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Munition", "./src/packs/__source/Munition", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Ruestzeug", "./src/packs/__source/Ruestzeug", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Behaelter", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Bekleidung", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Beleuchtung", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Buecher", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Essutensilien", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Sonstiges", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Werkzeug", "./src/packs/__source/Gegenstaende", "Equipment", false);
         convert("./src/packs/_source/liturgien-und-segnungen", "./src/packs/__source/liturgien", "Liturgy");
         convert("./src/packs/_source/wunden", "./src/packs/__source/wunden", "ActiveEffect");
 
diff --git a/src/assets/Armor/SODA_Icon_Armor_WoodenChestplate.png b/src/assets/Armor/SODA_Icon_Armor_WoodenChestplate.png
deleted file mode 100644
index bbfd7313..00000000
Binary files a/src/assets/Armor/SODA_Icon_Armor_WoodenChestplate.png and /dev/null differ
diff --git a/src/main.mjs b/src/main.mjs
index c2795c7b..be09043c 100644
--- a/src/main.mjs
+++ b/src/main.mjs
@@ -287,6 +287,26 @@ Hooks.once("init", () => {
         requiresReload: true
     })
 
+    Handlebars.registerHelper("weight", (data) => {
+
+        const baseValue = data * 1000 // to get to gramms (1/1000 Stone)
+
+        const stone = Math.floor(baseValue / 1000)
+        const remainder = baseValue - (stone * 1000)
+        const ounces = remainder / 25
+        let stoneRepresentation = ''
+        let ouncesRepresentation = ''
+        if (stone > 0) {
+            stoneRepresentation = `<span class="stone">${stone}</span>`
+        }
+        if (ounces > 0) {
+            ouncesRepresentation = `<span class="ounces">${ounces}</span>`
+        }
+
+        return new Handlebars.SafeString(`<span class="weight">${stoneRepresentation}${ouncesRepresentation}</span>`)
+
+    })
+
     Handlebars.registerHelper("currency", (data) => {
 
 
diff --git a/src/module/data/character.mjs b/src/module/data/character.mjs
index 9f4d176a..8297bd7d 100644
--- a/src/module/data/character.mjs
+++ b/src/module/data/character.mjs
@@ -125,6 +125,7 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
             cooldowns: new ArrayField(new SchemaField({
                 start: new NumberField({required: true, integer: true}),
                 current: new NumberField({required: true, integer: true}),
+                type: new StringField({required: true}), // "MANEUVER", "SPELL", "LITURGY", "TALENT"
                 data: new ObjectField()
             })),
 
diff --git a/src/module/data/cooldown.mjs b/src/module/data/cooldown.mjs
new file mode 100644
index 00000000..b0963290
--- /dev/null
+++ b/src/module/data/cooldown.mjs
@@ -0,0 +1,27 @@
+/**
+ * @typedef ManueverCooldownData
+ * @property {String} weapon
+ * @property {String} skill
+ * @property {String} target
+ * @property {*} maneuver,
+ * @property {Number} mod
+ * @property {Number} circumstance
+ * @property {Number} penalty
+ * @property {Number} targetNumber
+ */
+
+/**
+ * @typedef LiturgyCooldownData
+ * Data that pertains to sustain a Cooldown of a Liturgy, this includes a target if any the liturgy by Id and all applied modifications
+ * @property {String} liturgy the id of the Liturgy to be cast
+ * @property {String} target the id of the target, if any, of the Liturgy
+ * @property {[String]} mod an Array of Mods that are applied to the Liturgy
+ */
+
+/**
+ * @typedef Cooldown
+ * @property {({weapon: Item, skill: Item, target: Actor, mod: Number})=>Number} start
+ * @property {({weapon: Item, skill: Item, target: Actor, mod: Number})=>Number} current
+ * @property {ManueverCooldownData|LiturgyCooldownData} data
+ */
+
diff --git a/src/module/dialog/combatAction.mjs b/src/module/dialog/combatAction.mjs
index 153535c1..fee7e713 100644
--- a/src/module/dialog/combatAction.mjs
+++ b/src/module/dialog/combatAction.mjs
@@ -99,6 +99,7 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
             return true
         } else { // push into cooldown queue
             const cooldowns = this._actor.system.cooldowns
+            /** @type Cooldown */
             const newCooldown = {
                 start: maneuver.cooldown({weapon, skill, target, mod: this._mod}),
                 current: maneuver.cooldown({weapon, skill, target, mod: this._mod}),
diff --git a/src/module/sheets/character/equipment.mjs b/src/module/sheets/character/equipment.mjs
index 9f6d4730..fa974362 100644
--- a/src/module/sheets/character/equipment.mjs
+++ b/src/module/sheets/character/equipment.mjs
@@ -198,7 +198,7 @@ export default {
                                 && key.indexOf(".links") === -1
                                 && key.indexOf(".rechts") === -1
                                 && key.indexOf(".fernkampf") === -1
-                                && key.indexOf(".munition") === -1
+                                && key.indexOf(".Munition") === -1
                         })
                         updateObject[nextUnoccupiedSlot[0]] = target.dataset.itemId
                         thisObject.document.update(updateObject)
diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs
index d25b600a..de050dd2 100644
--- a/src/module/sheets/characterSheet.mjs
+++ b/src/module/sheets/characterSheet.mjs
@@ -71,7 +71,8 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
             template: Combat.template
         },
         equipment: {
-            template: Equipment.template
+            template: Equipment.template,
+            scrollable: ['']
         },
         skills: {
             template: Skills.template
diff --git a/src/module/xml-import/xml-import.mjs b/src/module/xml-import/xml-import.mjs
index 6086d057..07d97f4e 100644
--- a/src/module/xml-import/xml-import.mjs
+++ b/src/module/xml-import/xml-import.mjs
@@ -498,6 +498,7 @@ export class XmlImport {
             const compendiumOfArmor = game.packs.get('DSA_4-1.Armor');
             const compendiumOfWeapons = game.packs.get('DSA_4-1.Weapons');
             const compendiumOfAmmunition = game.packs.get('DSA_4-1.Ammunition');
+            const compendiumOfItems = game.packs.get('DSA_4-1.Items');
             let eId = null
             let compendium = null
             if (compendiumOfArmor?.index.find(p => p.name === e.name)) {
@@ -512,6 +513,10 @@ export class XmlImport {
                 eId = compendiumOfAmmunition?.index.find(p => p.name === e.name)
                 compendium = compendiumOfAmmunition
             }
+            if (compendiumOfItems?.index.find(p => p.name === e.name)) {
+                eId = compendiumOfItems?.index.find(p => p.name === e.name)
+                compendium = compendiumOfItems
+            }
 
             if (eId && compendium) {
                 compendium.getDocument(eId._id).then(sf => actor.createEmbeddedDocuments('Item', [sf]))
diff --git a/src/packs/_source/Beleuchtung/Duftoel.json b/src/packs/_source/Beleuchtung/Duftoel.json
deleted file mode 100644
index bb2f1951..00000000
--- a/src/packs/_source/Beleuchtung/Duftoel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Duftöl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Feuerstein u Stahl.json b/src/packs/_source/Beleuchtung/Feuerstein u Stahl.json
deleted file mode 100644
index 14092a15..00000000
--- a/src/packs/_source/Beleuchtung/Feuerstein u Stahl.json	
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Feuerstein u Stahl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Gwen-Petryl-Stein.json b/src/packs/_source/Beleuchtung/Gwen-Petryl-Stein.json
deleted file mode 100644
index 93997c8e..00000000
--- a/src/packs/_source/Beleuchtung/Gwen-Petryl-Stein.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Gwen-Petryl-Stein",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Kerze.json b/src/packs/_source/Beleuchtung/Kerze.json
deleted file mode 100644
index f4e98357..00000000
--- a/src/packs/_source/Beleuchtung/Kerze.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Kerze",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Kerzenlaterne, Holz-Pergament.json b/src/packs/_source/Beleuchtung/Kerzenlaterne, Holz-Pergament.json
deleted file mode 100644
index 0ce4a8ae..00000000
--- a/src/packs/_source/Beleuchtung/Kerzenlaterne, Holz-Pergament.json	
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Kerzenlaterne, Holz/Pergament",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Kerzenstaender.json b/src/packs/_source/Beleuchtung/Kerzenstaender.json
deleted file mode 100644
index ff922ab0..00000000
--- a/src/packs/_source/Beleuchtung/Kerzenstaender.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Kerzenständer, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Lampenoel.json b/src/packs/_source/Beleuchtung/Lampenoel.json
deleted file mode 100644
index cf437450..00000000
--- a/src/packs/_source/Beleuchtung/Lampenoel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Lampenöl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Oellampe.json b/src/packs/_source/Beleuchtung/Oellampe.json
deleted file mode 100644
index 5e1165c0..00000000
--- a/src/packs/_source/Beleuchtung/Oellampe.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Öllampe",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Pechfakel.json b/src/packs/_source/Beleuchtung/Pechfakel.json
deleted file mode 100644
index dcc79d8e..00000000
--- a/src/packs/_source/Beleuchtung/Pechfakel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Pechfakel",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Sturmlaterne.json b/src/packs/_source/Beleuchtung/Sturmlaterne.json
deleted file mode 100644
index 7be3bf32..00000000
--- a/src/packs/_source/Beleuchtung/Sturmlaterne.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Sturmlaterne, Öl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Zunderdose-Wasserdicht.json b/src/packs/_source/Beleuchtung/Zunderdose-Wasserdicht.json
deleted file mode 100644
index 26351c4a..00000000
--- a/src/packs/_source/Beleuchtung/Zunderdose-Wasserdicht.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Zunderdose, Wasserdicht",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Beleuchtung/Zunderdose.json b/src/packs/_source/Beleuchtung/Zunderdose.json
deleted file mode 100644
index 0ceeecc2..00000000
--- a/src/packs/_source/Beleuchtung/Zunderdose.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Zunderdose",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Einfaches Trinkhorn.json b/src/packs/_source/Essutensilien/Einfaches Trinkhorn.json
deleted file mode 100644
index 0640abc9..00000000
--- a/src/packs/_source/Essutensilien/Einfaches Trinkhorn.json	
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Einfaches Trinkhorn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Eisenpfanne.json b/src/packs/_source/Essutensilien/Eisenpfanne.json
deleted file mode 100644
index ddb252e3..00000000
--- a/src/packs/_source/Essutensilien/Eisenpfanne.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Eisenpfanne (1,5 Spann)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Eisentopf.json b/src/packs/_source/Essutensilien/Eisentopf.json
deleted file mode 100644
index 1a83fdd6..00000000
--- a/src/packs/_source/Essutensilien/Eisentopf.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Eisentopf (12 Maß)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Essebesteck-zinn.json b/src/packs/_source/Essutensilien/Essebesteck-zinn.json
deleted file mode 100644
index 4e3455ea..00000000
--- a/src/packs/_source/Essutensilien/Essebesteck-zinn.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Essbesteck, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Essmesser.json b/src/packs/_source/Essutensilien/Essmesser.json
deleted file mode 100644
index 593b6b34..00000000
--- a/src/packs/_source/Essutensilien/Essmesser.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Essbesteck, Eisen",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Henkelbecher.json b/src/packs/_source/Essutensilien/Henkelbecher.json
deleted file mode 100644
index 5ee2d4a2..00000000
--- a/src/packs/_source/Essutensilien/Henkelbecher.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Henkelbecher, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Holzbecher.json b/src/packs/_source/Essutensilien/Holzbecher.json
deleted file mode 100644
index ab748dee..00000000
--- a/src/packs/_source/Essutensilien/Holzbecher.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Holzbecher, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Holzloeffel.json b/src/packs/_source/Essutensilien/Holzloeffel.json
deleted file mode 100644
index 3a81fcc4..00000000
--- a/src/packs/_source/Essutensilien/Holzloeffel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Holzlöffel, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Holzteller.json b/src/packs/_source/Essutensilien/Holzteller.json
deleted file mode 100644
index 0efdde3a..00000000
--- a/src/packs/_source/Essutensilien/Holzteller.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Holzteller, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Karaffe.json b/src/packs/_source/Essutensilien/Karaffe.json
deleted file mode 100644
index ffb14336..00000000
--- a/src/packs/_source/Essutensilien/Karaffe.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Karaffe aus Neethaer Glas",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Kessel.json b/src/packs/_source/Essutensilien/Kessel.json
deleted file mode 100644
index 949b13c5..00000000
--- a/src/packs/_source/Essutensilien/Kessel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Kessel (20 Maß, emailiert)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Kupferkessel.json b/src/packs/_source/Essutensilien/Kupferkessel.json
deleted file mode 100644
index 2d927f0a..00000000
--- a/src/packs/_source/Essutensilien/Kupferkessel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Kupferkessel",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Silberpokal.json b/src/packs/_source/Essutensilien/Silberpokal.json
deleted file mode 100644
index 112a69b9..00000000
--- a/src/packs/_source/Essutensilien/Silberpokal.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Silberpokal",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Tonkrug.json b/src/packs/_source/Essutensilien/Tonkrug.json
deleted file mode 100644
index 8ad766f3..00000000
--- a/src/packs/_source/Essutensilien/Tonkrug.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "Tonkrug, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Dolchscheide.json b/src/packs/_source/Gegenstaende/Behaelter/Dolchscheide.json
new file mode 100644
index 00000000..2ef4578a
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Dolchscheide.json
@@ -0,0 +1,9 @@
+{
+  "name": "Dolchscheide, versteckt",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Key.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Futterbeutel.json b/src/packs/_source/Gegenstaende/Behaelter/Futterbeutel.json
new file mode 100644
index 00000000..b1320f01
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Futterbeutel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Futterbeutel",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 5
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Geldbeutel.json b/src/packs/_source/Gegenstaende/Behaelter/Geldbeutel.json
new file mode 100644
index 00000000..22ad9190
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Geldbeutel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Geldbeutel, Leder",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 1
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Guerteltasche.json b/src/packs/_source/Gegenstaende/Behaelter/Guerteltasche.json
new file mode 100644
index 00000000..cfe514bb
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Guerteltasche.json
@@ -0,0 +1,9 @@
+{
+  "name": "Gürteltasche, Hartleder",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Lederrucksack.json b/src/packs/_source/Gegenstaende/Behaelter/Lederrucksack.json
new file mode 100644
index 00000000..695e8eea
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Lederrucksack.json
@@ -0,0 +1,9 @@
+{
+  "name": "Lederrucksack (15 Stein)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 40
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Nachthemd.json b/src/packs/_source/Gegenstaende/Behaelter/Nachthemd.json
new file mode 100644
index 00000000..1a3ca31f
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Nachthemd.json
@@ -0,0 +1,9 @@
+{
+  "name": "Nachthemd, Leinen",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_192.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Packsattel.json b/src/packs/_source/Gegenstaende/Behaelter/Packsattel.json
new file mode 100644
index 00000000..ba4591a3
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Packsattel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Packsattel, klein",
+  "image": "systems/DSA_4-1/assets/Quivers/SODA_Icons_Quiver_36.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 15,
+  "price": 300
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Quiver.json b/src/packs/_source/Gegenstaende/Behaelter/Quiver.json
new file mode 100644
index 00000000..511b1a06
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Quiver.json
@@ -0,0 +1,9 @@
+{
+  "name": "Köcher, Leder (20 Pfeile)",
+  "image": "systems/DSA_4-1/assets/Quivers/SODA_Icons_Quiver_36.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Schmuckkaestchen.json b/src/packs/_source/Gegenstaende/Behaelter/Schmuckkaestchen.json
new file mode 100644
index 00000000..b02b9c4f
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Schmuckkaestchen.json
@@ -0,0 +1,9 @@
+{
+  "name": "Schmuckkästchen mit Schloss (3 Stein)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Chest.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.125,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Tabakdose.json b/src/packs/_source/Gegenstaende/Behaelter/Tabakdose.json
new file mode 100644
index 00000000..022eb7a0
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Tabakdose.json
@@ -0,0 +1,9 @@
+{
+  "name": "Tabakdose, Silber",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Trinkflasche.json b/src/packs/_source/Gegenstaende/Behaelter/Trinkflasche.json
new file mode 100644
index 00000000..2d808f07
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Trinkflasche.json
@@ -0,0 +1,9 @@
+{
+  "name": "Trinkflasche (5 Schank)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Zunderdose-Wasserdicht.json b/src/packs/_source/Gegenstaende/Behaelter/Zunderdose-Wasserdicht.json
new file mode 100644
index 00000000..748ed089
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Zunderdose-Wasserdicht.json
@@ -0,0 +1,9 @@
+{
+  "name": "Zunderdose, Wasserdicht",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 70
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Behaelter/Zunderdose.json b/src/packs/_source/Gegenstaende/Behaelter/Zunderdose.json
new file mode 100644
index 00000000..689ee6fb
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Behaelter/Zunderdose.json
@@ -0,0 +1,9 @@
+{
+  "name": "Zunderdose",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Bluse.json b/src/packs/_source/Gegenstaende/Bekleidung/Bluse.json
new file mode 100644
index 00000000..2b027794
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Bluse.json
@@ -0,0 +1,9 @@
+{
+  "name": "Bluse",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_146.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 8
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Hose.json b/src/packs/_source/Gegenstaende/Bekleidung/Hose.json
new file mode 100644
index 00000000..30e8bea9
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Hose.json
@@ -0,0 +1,9 @@
+{
+  "name": "Hose",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Kaftan.json b/src/packs/_source/Gegenstaende/Bekleidung/Kaftan.json
new file mode 100644
index 00000000..9e57226f
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Kaftan.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kaftan",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_192.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 3,
+  "price": 70
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Korsett.json b/src/packs/_source/Gegenstaende/Bekleidung/Korsett.json
new file mode 100644
index 00000000..f930db6c
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Korsett.json
@@ -0,0 +1,9 @@
+{
+  "name": "Korsett",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_147.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.875,
+  "price": 600
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Lederguertel.json b/src/packs/_source/Gegenstaende/Bekleidung/Lederguertel.json
new file mode 100644
index 00000000..484e482a
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Lederguertel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Ledergürtel",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBelt.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Lederhandschuhe.json b/src/packs/_source/Gegenstaende/Bekleidung/Lederhandschuhe.json
new file mode 100644
index 00000000..fcd3e646
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Lederhandschuhe.json
@@ -0,0 +1,9 @@
+{
+  "name": "Lederhandschuhe",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherGloves.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.15,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Lederhose.json b/src/packs/_source/Gegenstaende/Bekleidung/Lederhose.json
new file mode 100644
index 00000000..decfc7bc
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Lederhose.json
@@ -0,0 +1,9 @@
+{
+  "name": "Lederhose",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.15,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Rock.json b/src/packs/_source/Gegenstaende/Bekleidung/Rock.json
new file mode 100644
index 00000000..0613f9c8
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Rock.json
@@ -0,0 +1,9 @@
+{
+  "name": "Rock",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Clothing_Scarf.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.125,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Schwere-Reitstiefel.json b/src/packs/_source/Gegenstaende/Bekleidung/Schwere-Reitstiefel.json
new file mode 100644
index 00000000..14bb6f28
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Schwere-Reitstiefel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Schwere Reitstiefel",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2.5,
+  "price": 200
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Bekleidung/Unterkleidung.json b/src/packs/_source/Gegenstaende/Bekleidung/Unterkleidung.json
new file mode 100644
index 00000000..9e321eeb
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Bekleidung/Unterkleidung.json
@@ -0,0 +1,9 @@
+{
+  "name": "Unterkleidung",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_146.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2.5,
+  "price": 250
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Duftoel.json b/src/packs/_source/Gegenstaende/Beleuchtung/Duftoel.json
new file mode 100644
index 00000000..8a716f1d
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Duftoel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Duftöl",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Feuerstein u Stahl.json b/src/packs/_source/Gegenstaende/Beleuchtung/Feuerstein u Stahl.json
new file mode 100644
index 00000000..3a948ba6
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Feuerstein u Stahl.json	
@@ -0,0 +1,9 @@
+{
+  "name": "Feuerstein u Stahl",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Bar2.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 6
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Gwen-Petryl-Stein.json b/src/packs/_source/Gegenstaende/Beleuchtung/Gwen-Petryl-Stein.json
new file mode 100644
index 00000000..2d0c9410
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Gwen-Petryl-Stein.json
@@ -0,0 +1,9 @@
+{
+  "name": "Gwen-Petryl-Stein",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Gem3.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 10000
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Kerze.json b/src/packs/_source/Gegenstaende/Beleuchtung/Kerze.json
new file mode 100644
index 00000000..5c5e9ef0
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Kerze.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kerze",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 1
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenlaterne, Holz-Pergament.json b/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenlaterne, Holz-Pergament.json
new file mode 100644
index 00000000..4d9cc8fe
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenlaterne, Holz-Pergament.json	
@@ -0,0 +1,9 @@
+{
+  "name": "Kerzenlaterne, Holz/Pergament",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Lantern.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 50
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenstaender.json b/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenstaender.json
new file mode 100644
index 00000000..db02a022
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Kerzenstaender.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kerzenständer, Zinn",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 40
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Lampenoel.json b/src/packs/_source/Gegenstaende/Beleuchtung/Lampenoel.json
new file mode 100644
index 00000000..9fad44cc
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Lampenoel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Lampenöl",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Oellampe.json b/src/packs/_source/Gegenstaende/Beleuchtung/Oellampe.json
new file mode 100644
index 00000000..b40cbada
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Oellampe.json
@@ -0,0 +1,9 @@
+{
+  "name": "Öllampe",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Pechfakel.json b/src/packs/_source/Gegenstaende/Beleuchtung/Pechfakel.json
new file mode 100644
index 00000000..d3914302
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Pechfakel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Pechfakel",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Torch.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 5
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Beleuchtung/Sturmlaterne.json b/src/packs/_source/Gegenstaende/Beleuchtung/Sturmlaterne.json
new file mode 100644
index 00000000..31c112ca
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Beleuchtung/Sturmlaterne.json
@@ -0,0 +1,9 @@
+{
+  "name": "Sturmlaterne, Öl",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Lantern.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 120
+}
\ No newline at end of file
diff --git a/src/packs/_source/buecher/buch.json b/src/packs/_source/Gegenstaende/Buecher/Buch.json
similarity index 51%
rename from src/packs/_source/buecher/buch.json
rename to src/packs/_source/Gegenstaende/Buecher/Buch.json
index d9d18241..e48fac2b 100644
--- a/src/packs/_source/buecher/buch.json
+++ b/src/packs/_source/Gegenstaende/Buecher/Buch.json
@@ -1,6 +1,6 @@
 {
   "name": "Buch",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
+  "image": "systems/DSA_4-1/assets/System_Misc/SODA_Icon_System_Misc_Book.png",
   "category": [
     "Gegenstand"
   ],
diff --git a/src/packs/_source/Gegenstaende/Buecher/Pergament.json b/src/packs/_source/Gegenstaende/Buecher/Pergament.json
new file mode 100644
index 00000000..3a663aa5
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Buecher/Pergament.json
@@ -0,0 +1,9 @@
+{
+  "name": "Pergament",
+  "image": "systems/DSA_4-1/assets/Books_Paper/SODA_Icon_Books_Paper_Letter.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 12
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Buecher/Tagebuch.json b/src/packs/_source/Gegenstaende/Buecher/Tagebuch.json
new file mode 100644
index 00000000..fb1c2959
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Buecher/Tagebuch.json
@@ -0,0 +1,9 @@
+{
+  "name": "Tagebuch, Papier",
+  "image": "systems/DSA_4-1/assets/Books_Paper/SODA_Icon_Books_Paper_Book1.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 350
+}
\ No newline at end of file
diff --git a/src/packs/_source/Essutensilien/Bratspieß.json b/src/packs/_source/Gegenstaende/Essutensilien/Bratspieß.json
similarity index 52%
rename from src/packs/_source/Essutensilien/Bratspieß.json
rename to src/packs/_source/Gegenstaende/Essutensilien/Bratspieß.json
index 5dfe87ad..f50bfe27 100644
--- a/src/packs/_source/Essutensilien/Bratspieß.json
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Bratspieß.json
@@ -1,9 +1,9 @@
 {
   "name": "Bratspieß, Eisen",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
+  "image": "systems/DSA_4-1/assets/Meat/SODA_Icons_Meat_2.png",
   "category": [
     "Gegenstand"
   ],
   "weight": 3,
-  "price": 70
+  "price": 50
 }
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Einfaches Trinkhorn.json b/src/packs/_source/Gegenstaende/Essutensilien/Einfaches Trinkhorn.json
new file mode 100644
index 00000000..e5efd9b0
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Einfaches Trinkhorn.json	
@@ -0,0 +1,9 @@
+{
+  "name": "Einfaches Trinkhorn",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Horn2.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 50
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Eisenpfanne.json b/src/packs/_source/Gegenstaende/Essutensilien/Eisenpfanne.json
new file mode 100644
index 00000000..2e83b40d
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Eisenpfanne.json
@@ -0,0 +1,9 @@
+{
+  "name": "Eisenpfanne (1,5 Spann)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2,
+  "price": 80
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Eisentopf.json b/src/packs/_source/Gegenstaende/Essutensilien/Eisentopf.json
new file mode 100644
index 00000000..0cec6dd1
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Eisentopf.json
@@ -0,0 +1,9 @@
+{
+  "name": "Eisentopf (12 Maß)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 3,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Essebesteck-zinn.json b/src/packs/_source/Gegenstaende/Essutensilien/Essebesteck-zinn.json
new file mode 100644
index 00000000..1fd3cbcf
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Essebesteck-zinn.json
@@ -0,0 +1,9 @@
+{
+  "name": "Essbesteck, Zinn",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Essmesser.json b/src/packs/_source/Gegenstaende/Essutensilien/Essmesser.json
new file mode 100644
index 00000000..7874e32a
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Essmesser.json
@@ -0,0 +1,9 @@
+{
+  "name": "Essbesteck, Eisen",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Henkelbecher.json b/src/packs/_source/Gegenstaende/Essutensilien/Henkelbecher.json
new file mode 100644
index 00000000..e917a5d3
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Henkelbecher.json
@@ -0,0 +1,9 @@
+{
+  "name": "Henkelbecher, Zinn",
+  "image": "systems/DSA_4-1/assets/Food/SODA_Icon_Food_CupOfTea.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 40
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Holzbecher.json b/src/packs/_source/Gegenstaende/Essutensilien/Holzbecher.json
new file mode 100644
index 00000000..ec8d75b5
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Holzbecher.json
@@ -0,0 +1,9 @@
+{
+  "name": "Holzbecher, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 1
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Holzloeffel.json b/src/packs/_source/Gegenstaende/Essutensilien/Holzloeffel.json
new file mode 100644
index 00000000..1c2b3127
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Holzloeffel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Holzlöffel, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.075,
+  "price": 1
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Holzteller.json b/src/packs/_source/Gegenstaende/Essutensilien/Holzteller.json
new file mode 100644
index 00000000..75c881b5
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Holzteller.json
@@ -0,0 +1,9 @@
+{
+  "name": "Holzteller, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.1,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Karaffe.json b/src/packs/_source/Gegenstaende/Essutensilien/Karaffe.json
new file mode 100644
index 00000000..bd8b45d6
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Karaffe.json
@@ -0,0 +1,9 @@
+{
+  "name": "Karaffe aus Neethaer Glas",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Vase.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 200
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Kessel.json b/src/packs/_source/Gegenstaende/Essutensilien/Kessel.json
new file mode 100644
index 00000000..915c741b
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Kessel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kessel (20 Maß, emailiert)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Vase.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.75,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Kupferkessel.json b/src/packs/_source/Gegenstaende/Essutensilien/Kupferkessel.json
new file mode 100644
index 00000000..06be9a8e
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Kupferkessel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kupferkessel",
+  "image": "systems/DSA_4-1/assets/Modern/SODA_Icon_Modern_Pot.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 4,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Silberpokal.json b/src/packs/_source/Gegenstaende/Essutensilien/Silberpokal.json
new file mode 100644
index 00000000..281a405c
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Silberpokal.json
@@ -0,0 +1,9 @@
+{
+  "name": "Silberpokal",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Coins.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Essutensilien/Tonkrug.json b/src/packs/_source/Gegenstaende/Essutensilien/Tonkrug.json
new file mode 100644
index 00000000..0ab21a51
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Essutensilien/Tonkrug.json
@@ -0,0 +1,9 @@
+{
+  "name": "Tonkrug, einfach",
+  "image": "systems/DSA_4-1/assets/Food/SODA_Icon_Food_CupOfTea.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 50
+}
\ No newline at end of file
diff --git a/src/packs/_source/munition/balläster-m.json b/src/packs/_source/Gegenstaende/Munition/balläster-m.json
similarity index 100%
rename from src/packs/_source/munition/balläster-m.json
rename to src/packs/_source/Gegenstaende/Munition/balläster-m.json
diff --git a/src/packs/_source/munition/eisenwalder-m.json b/src/packs/_source/Gegenstaende/Munition/eisenwalder-m.json
similarity index 100%
rename from src/packs/_source/munition/eisenwalder-m.json
rename to src/packs/_source/Gegenstaende/Munition/eisenwalder-m.json
diff --git a/src/packs/_source/munition/elfenbogen-m.json b/src/packs/_source/Gegenstaende/Munition/elfenbogen-m.json
similarity index 100%
rename from src/packs/_source/munition/elfenbogen-m.json
rename to src/packs/_source/Gegenstaende/Munition/elfenbogen-m.json
diff --git a/src/packs/_source/munition/kompositbogen-m.json b/src/packs/_source/Gegenstaende/Munition/kompositbogen-m.json
similarity index 100%
rename from src/packs/_source/munition/kompositbogen-m.json
rename to src/packs/_source/Gegenstaende/Munition/kompositbogen-m.json
diff --git a/src/packs/_source/munition/kriegsbogen-m.json b/src/packs/_source/Gegenstaende/Munition/kriegsbogen-m.json
similarity index 100%
rename from src/packs/_source/munition/kriegsbogen-m.json
rename to src/packs/_source/Gegenstaende/Munition/kriegsbogen-m.json
diff --git a/src/packs/_source/munition/kurzbogen-m.json b/src/packs/_source/Gegenstaende/Munition/kurzbogen-m.json
similarity index 100%
rename from src/packs/_source/munition/kurzbogen-m.json
rename to src/packs/_source/Gegenstaende/Munition/kurzbogen-m.json
diff --git a/src/packs/_source/munition/langbogen-m.json b/src/packs/_source/Gegenstaende/Munition/langbogen-m.json
similarity index 100%
rename from src/packs/_source/munition/langbogen-m.json
rename to src/packs/_source/Gegenstaende/Munition/langbogen-m.json
diff --git a/src/packs/_source/munition/leichte-armbrust-m.json b/src/packs/_source/Gegenstaende/Munition/leichte-armbrust-m.json
similarity index 100%
rename from src/packs/_source/munition/leichte-armbrust-m.json
rename to src/packs/_source/Gegenstaende/Munition/leichte-armbrust-m.json
diff --git a/src/packs/_source/munition/windenarmbrust-m.json b/src/packs/_source/Gegenstaende/Munition/windenarmbrust-m.json
similarity index 100%
rename from src/packs/_source/munition/windenarmbrust-m.json
rename to src/packs/_source/Gegenstaende/Munition/windenarmbrust-m.json
diff --git a/src/packs/_source/ruestzeug/buckler.json b/src/packs/_source/Gegenstaende/Ruestzeug/buckler.json
similarity index 100%
rename from src/packs/_source/ruestzeug/buckler.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/buckler.json
diff --git a/src/packs/_source/ruestzeug/dicke-kleidung.json b/src/packs/_source/Gegenstaende/Ruestzeug/dicke-kleidung.json
similarity index 100%
rename from src/packs/_source/ruestzeug/dicke-kleidung.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/dicke-kleidung.json
diff --git a/src/packs/_source/ruestzeug/einfacher-holzschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/einfacher-holzschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/einfacher-holzschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/einfacher-holzschild.json
diff --git a/src/packs/_source/ruestzeug/garether-platte.json b/src/packs/_source/Gegenstaende/Ruestzeug/garether-platte.json
similarity index 100%
rename from src/packs/_source/ruestzeug/garether-platte.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/garether-platte.json
diff --git a/src/packs/_source/ruestzeug/großer-lederschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/großer-lederschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/großer-lederschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/großer-lederschild.json
diff --git a/src/packs/_source/ruestzeug/großschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/großschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/großschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/großschild.json
diff --git a/src/packs/_source/ruestzeug/horasischer-reiterharnisch.json b/src/packs/_source/Gegenstaende/Ruestzeug/horasischer-reiterharnisch.json
similarity index 100%
rename from src/packs/_source/ruestzeug/horasischer-reiterharnisch.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/horasischer-reiterharnisch.json
diff --git a/src/packs/_source/ruestzeug/kettenhemd-halbarm.json b/src/packs/_source/Gegenstaende/Ruestzeug/kettenhemd-halbarm.json
similarity index 100%
rename from src/packs/_source/ruestzeug/kettenhemd-halbarm.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/kettenhemd-halbarm.json
diff --git a/src/packs/_source/ruestzeug/komplette-gestechruestung.json b/src/packs/_source/Gegenstaende/Ruestzeug/komplette-gestechruestung.json
similarity index 100%
rename from src/packs/_source/ruestzeug/komplette-gestechruestung.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/komplette-gestechruestung.json
diff --git a/src/packs/_source/ruestzeug/kroetenhaut.json b/src/packs/_source/Gegenstaende/Ruestzeug/kroetenhaut.json
similarity index 100%
rename from src/packs/_source/ruestzeug/kroetenhaut.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/kroetenhaut.json
diff --git a/src/packs/_source/ruestzeug/kuerass.json b/src/packs/_source/Gegenstaende/Ruestzeug/kuerass.json
similarity index 100%
rename from src/packs/_source/ruestzeug/kuerass.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/kuerass.json
diff --git a/src/packs/_source/ruestzeug/langes-kettenhemd.json b/src/packs/_source/Gegenstaende/Ruestzeug/langes-kettenhemd.json
similarity index 100%
rename from src/packs/_source/ruestzeug/langes-kettenhemd.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/langes-kettenhemd.json
diff --git a/src/packs/_source/ruestzeug/lederharnisch.json b/src/packs/_source/Gegenstaende/Ruestzeug/lederharnisch.json
similarity index 100%
rename from src/packs/_source/ruestzeug/lederharnisch.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/lederharnisch.json
diff --git a/src/packs/_source/ruestzeug/lederschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/lederschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/lederschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/lederschild.json
diff --git a/src/packs/_source/ruestzeug/leichte-platte.json b/src/packs/_source/Gegenstaende/Ruestzeug/leichte-platte.json
similarity index 100%
rename from src/packs/_source/ruestzeug/leichte-platte.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/leichte-platte.json
diff --git a/src/packs/_source/ruestzeug/schuppenpanzer.json b/src/packs/_source/Gegenstaende/Ruestzeug/schuppenpanzer.json
similarity index 100%
rename from src/packs/_source/ruestzeug/schuppenpanzer.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/schuppenpanzer.json
diff --git a/src/packs/_source/ruestzeug/spiegelpanzer.json b/src/packs/_source/Gegenstaende/Ruestzeug/spiegelpanzer.json
similarity index 100%
rename from src/packs/_source/ruestzeug/spiegelpanzer.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/spiegelpanzer.json
diff --git a/src/packs/_source/ruestzeug/thorwalerschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/thorwalerschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/thorwalerschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/thorwalerschild.json
diff --git a/src/packs/_source/ruestzeug/verstaerkter-holzschild.json b/src/packs/_source/Gegenstaende/Ruestzeug/verstaerkter-holzschild.json
similarity index 100%
rename from src/packs/_source/ruestzeug/verstaerkter-holzschild.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/verstaerkter-holzschild.json
diff --git a/src/packs/_source/ruestzeug/vollmetalbuckler.json b/src/packs/_source/Gegenstaende/Ruestzeug/vollmetalbuckler.json
similarity index 100%
rename from src/packs/_source/ruestzeug/vollmetalbuckler.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/vollmetalbuckler.json
diff --git a/src/packs/_source/ruestzeug/wattierte-unterkleidung.json b/src/packs/_source/Gegenstaende/Ruestzeug/wattierte-unterkleidung.json
similarity index 100%
rename from src/packs/_source/ruestzeug/wattierte-unterkleidung.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/wattierte-unterkleidung.json
diff --git a/src/packs/_source/ruestzeug/wattierter-waffenrock.json b/src/packs/_source/Gegenstaende/Ruestzeug/wattierter-waffenrock.json
similarity index 100%
rename from src/packs/_source/ruestzeug/wattierter-waffenrock.json
rename to src/packs/_source/Gegenstaende/Ruestzeug/wattierter-waffenrock.json
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Gewandknopf.json b/src/packs/_source/Gegenstaende/Sonstiges/Gewandknopf.json
new file mode 100644
index 00000000..2e9331b8
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Gewandknopf.json
@@ -0,0 +1,9 @@
+{
+  "name": "Gewandknopf",
+  "image": "systems/DSA_4-1/assets/Accessories/SODA_Icon_Accessory_Medallion.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Halskette.json b/src/packs/_source/Gegenstaende/Sonstiges/Halskette.json
new file mode 100644
index 00000000..9ebe6164
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Halskette.json
@@ -0,0 +1,9 @@
+{
+  "name": "Halskette",
+  "image": "systems/DSA_4-1/assets/Accessories/SODA_Icon_Accessory_Necklace.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 50
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Parfuem.json b/src/packs/_source/Gegenstaende/Sonstiges/Parfuem.json
new file mode 100644
index 00000000..a3d58680
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Parfuem.json
@@ -0,0 +1,9 @@
+{
+  "name": "Parfüm",
+  "image": "systems/DSA_4-1/assets/Potions_Herbs/SODA_Icon_PortionsHerbs_Potion_Purple.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 300
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Puder.json b/src/packs/_source/Gegenstaende/Sonstiges/Puder.json
new file mode 100644
index 00000000..e42ee64c
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Puder.json
@@ -0,0 +1,9 @@
+{
+  "name": "Puder, Sortiment",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_27.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Reitsattel.json b/src/packs/_source/Gegenstaende/Sonstiges/Reitsattel.json
new file mode 100644
index 00000000..60b860e8
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Reitsattel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Reitsattel",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 6,
+  "price": 300
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Taschentuch.json b/src/packs/_source/Gegenstaende/Sonstiges/Taschentuch.json
new file mode 100644
index 00000000..463d77d0
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Taschentuch.json
@@ -0,0 +1,9 @@
+{
+  "name": "Taschentuch, Leinen",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Fur.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 10
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Wappendecke.json b/src/packs/_source/Gegenstaende/Sonstiges/Wappendecke.json
new file mode 100644
index 00000000..21cfbf1f
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Wappendecke.json
@@ -0,0 +1,9 @@
+{
+  "name": "Wappendecke",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 10,
+  "price": 500
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Sonstiges/Zuegel-und-Zaumzeug.json b/src/packs/_source/Gegenstaende/Sonstiges/Zuegel-und-Zaumzeug.json
new file mode 100644
index 00000000..edaa593b
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Sonstiges/Zuegel-und-Zaumzeug.json
@@ -0,0 +1,9 @@
+{
+  "name": "Zügel und Zaumzeug",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/waffen/andergaster.json b/src/packs/_source/Gegenstaende/Waffen/andergaster.json
similarity index 100%
rename from src/packs/_source/waffen/andergaster.json
rename to src/packs/_source/Gegenstaende/Waffen/andergaster.json
diff --git a/src/packs/_source/waffen/anderthalbhaender.json b/src/packs/_source/Gegenstaende/Waffen/anderthalbhaender.json
similarity index 100%
rename from src/packs/_source/waffen/anderthalbhaender.json
rename to src/packs/_source/Gegenstaende/Waffen/anderthalbhaender.json
diff --git a/src/packs/_source/waffen/balläster.json b/src/packs/_source/Gegenstaende/Waffen/balläster.json
similarity index 100%
rename from src/packs/_source/waffen/balläster.json
rename to src/packs/_source/Gegenstaende/Waffen/balläster.json
diff --git a/src/packs/_source/waffen/barbarenstreitaxt.json b/src/packs/_source/Gegenstaende/Waffen/barbarenstreitaxt.json
similarity index 100%
rename from src/packs/_source/waffen/barbarenstreitaxt.json
rename to src/packs/_source/Gegenstaende/Waffen/barbarenstreitaxt.json
diff --git a/src/packs/_source/waffen/beil.json b/src/packs/_source/Gegenstaende/Waffen/beil.json
similarity index 100%
rename from src/packs/_source/waffen/beil.json
rename to src/packs/_source/Gegenstaende/Waffen/beil.json
diff --git a/src/packs/_source/waffen/borndorn.json b/src/packs/_source/Gegenstaende/Waffen/borndorn.json
similarity index 100%
rename from src/packs/_source/waffen/borndorn.json
rename to src/packs/_source/Gegenstaende/Waffen/borndorn.json
diff --git a/src/packs/_source/waffen/boronssichel.json b/src/packs/_source/Gegenstaende/Waffen/boronssichel.json
similarity index 100%
rename from src/packs/_source/waffen/boronssichel.json
rename to src/packs/_source/Gegenstaende/Waffen/boronssichel.json
diff --git a/src/packs/_source/waffen/brabakbengel.json b/src/packs/_source/Gegenstaende/Waffen/brabakbengel.json
similarity index 100%
rename from src/packs/_source/waffen/brabakbengel.json
rename to src/packs/_source/Gegenstaende/Waffen/brabakbengel.json
diff --git a/src/packs/_source/waffen/degen.json b/src/packs/_source/Gegenstaende/Waffen/degen.json
similarity index 100%
rename from src/packs/_source/waffen/degen.json
rename to src/packs/_source/Gegenstaende/Waffen/degen.json
diff --git a/src/packs/_source/waffen/dolch.json b/src/packs/_source/Gegenstaende/Waffen/dolch.json
similarity index 100%
rename from src/packs/_source/waffen/dolch.json
rename to src/packs/_source/Gegenstaende/Waffen/dolch.json
diff --git a/src/packs/_source/waffen/doppelkhunchomer.json b/src/packs/_source/Gegenstaende/Waffen/doppelkhunchomer.json
similarity index 90%
rename from src/packs/_source/waffen/doppelkhunchomer.json
rename to src/packs/_source/Gegenstaende/Waffen/doppelkhunchomer.json
index a6dbead9..bc3ffe04 100644
--- a/src/packs/_source/waffen/doppelkhunchomer.json
+++ b/src/packs/_source/Gegenstaende/Waffen/doppelkhunchomer.json
@@ -1,6 +1,6 @@
 {
   "name": "Doppelkhunchomer",
-  "image": "systems/DSA_4-1/assets/Long Sowrds/SODA_Icons_LongSword_13.png",
+  "image": "systems/DSA_4-1/assets/Long Swords/SODA_Icons_LongSword_13.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/drachenzahn.json b/src/packs/_source/Gegenstaende/Waffen/drachenzahn.json
similarity index 100%
rename from src/packs/_source/waffen/drachenzahn.json
rename to src/packs/_source/Gegenstaende/Waffen/drachenzahn.json
diff --git a/src/packs/_source/waffen/dreizack.json b/src/packs/_source/Gegenstaende/Waffen/dreizack.json
similarity index 100%
rename from src/packs/_source/waffen/dreizack.json
rename to src/packs/_source/Gegenstaende/Waffen/dreizack.json
diff --git a/src/packs/_source/waffen/dschadra.json b/src/packs/_source/Gegenstaende/Waffen/dschadra.json
similarity index 88%
rename from src/packs/_source/waffen/dschadra.json
rename to src/packs/_source/Gegenstaende/Waffen/dschadra.json
index 43fe6bd1..10ee5a16 100644
--- a/src/packs/_source/waffen/dschadra.json
+++ b/src/packs/_source/Gegenstaende/Waffen/dschadra.json
@@ -1,6 +1,6 @@
 {
   "name": "Dschadra",
-  "image": "systems/DSA_4-1/assets/Raipers/SODA_Icons_Raipers_2.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_BattleAxe.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe",
diff --git a/src/packs/_source/waffen/eisenwalder.json b/src/packs/_source/Gegenstaende/Waffen/eisenwalder.json
similarity index 100%
rename from src/packs/_source/waffen/eisenwalder.json
rename to src/packs/_source/Gegenstaende/Waffen/eisenwalder.json
diff --git a/src/packs/_source/waffen/elfenbogen.json b/src/packs/_source/Gegenstaende/Waffen/elfenbogen.json
similarity index 100%
rename from src/packs/_source/waffen/elfenbogen.json
rename to src/packs/_source/Gegenstaende/Waffen/elfenbogen.json
diff --git a/src/packs/_source/waffen/entermesser.json b/src/packs/_source/Gegenstaende/Waffen/entermesser.json
similarity index 100%
rename from src/packs/_source/waffen/entermesser.json
rename to src/packs/_source/Gegenstaende/Waffen/entermesser.json
diff --git a/src/packs/_source/waffen/fackel.json b/src/packs/_source/Gegenstaende/Waffen/fackel.json
similarity index 100%
rename from src/packs/_source/waffen/fackel.json
rename to src/packs/_source/Gegenstaende/Waffen/fackel.json
diff --git a/src/packs/_source/waffen/fausthieb.json b/src/packs/_source/Gegenstaende/Waffen/fausthieb.json
similarity index 100%
rename from src/packs/_source/waffen/fausthieb.json
rename to src/packs/_source/Gegenstaende/Waffen/fausthieb.json
diff --git a/src/packs/_source/waffen/felsspalter.json b/src/packs/_source/Gegenstaende/Waffen/felsspalter.json
similarity index 100%
rename from src/packs/_source/waffen/felsspalter.json
rename to src/packs/_source/Gegenstaende/Waffen/felsspalter.json
diff --git a/src/packs/_source/waffen/florett.json b/src/packs/_source/Gegenstaende/Waffen/florett.json
similarity index 100%
rename from src/packs/_source/waffen/florett.json
rename to src/packs/_source/Gegenstaende/Waffen/florett.json
diff --git a/src/packs/_source/waffen/glefe.json b/src/packs/_source/Gegenstaende/Waffen/glefe.json
similarity index 100%
rename from src/packs/_source/waffen/glefe.json
rename to src/packs/_source/Gegenstaende/Waffen/glefe.json
diff --git a/src/packs/_source/waffen/hakenspieß.json b/src/packs/_source/Gegenstaende/Waffen/hakenspieß.json
similarity index 88%
rename from src/packs/_source/waffen/hakenspieß.json
rename to src/packs/_source/Gegenstaende/Waffen/hakenspieß.json
index 4e6d7d32..ea869510 100644
--- a/src/packs/_source/waffen/hakenspieß.json
+++ b/src/packs/_source/Gegenstaende/Waffen/hakenspieß.json
@@ -1,6 +1,6 @@
 {
   "name": "Hakenspieß",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Helbard.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/haumesser.json b/src/packs/_source/Gegenstaende/Waffen/haumesser.json
similarity index 86%
rename from src/packs/_source/waffen/haumesser.json
rename to src/packs/_source/Gegenstaende/Waffen/haumesser.json
index 78333678..ba2eb698 100644
--- a/src/packs/_source/waffen/haumesser.json
+++ b/src/packs/_source/Gegenstaende/Waffen/haumesser.json
@@ -1,6 +1,6 @@
 {
   "name": "Haumesser",
-  "image": "systems/DSA_4-1/assets/arsenal/knife.png",
+  "image": "systems/DSA_4-1/assets/Weapons/Weapons/SODA_Icon_Weapons_Knife.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/hellebarde.json b/src/packs/_source/Gegenstaende/Waffen/hellebarde.json
similarity index 88%
rename from src/packs/_source/waffen/hellebarde.json
rename to src/packs/_source/Gegenstaende/Waffen/hellebarde.json
index bab4acea..ac0815eb 100644
--- a/src/packs/_source/waffen/hellebarde.json
+++ b/src/packs/_source/Gegenstaende/Waffen/hellebarde.json
@@ -1,6 +1,6 @@
 {
   "name": "Hellebarde",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm1.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Helbard.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/holzfälleraxt.json b/src/packs/_source/Gegenstaende/Waffen/holzfälleraxt.json
similarity index 100%
rename from src/packs/_source/waffen/holzfälleraxt.json
rename to src/packs/_source/Gegenstaende/Waffen/holzfälleraxt.json
diff --git a/src/packs/_source/waffen/holzspeer.json b/src/packs/_source/Gegenstaende/Waffen/holzspeer.json
similarity index 100%
rename from src/packs/_source/waffen/holzspeer.json
rename to src/packs/_source/Gegenstaende/Waffen/holzspeer.json
diff --git a/src/packs/_source/waffen/jagdmesser.json b/src/packs/_source/Gegenstaende/Waffen/jagdmesser.json
similarity index 100%
rename from src/packs/_source/waffen/jagdmesser.json
rename to src/packs/_source/Gegenstaende/Waffen/jagdmesser.json
diff --git a/src/packs/_source/waffen/jagdspieß.json b/src/packs/_source/Gegenstaende/Waffen/jagdspieß.json
similarity index 87%
rename from src/packs/_source/waffen/jagdspieß.json
rename to src/packs/_source/Gegenstaende/Waffen/jagdspieß.json
index 1df6d77c..271ead3c 100644
--- a/src/packs/_source/waffen/jagdspieß.json
+++ b/src/packs/_source/Gegenstaende/Waffen/jagdspieß.json
@@ -1,6 +1,6 @@
 {
   "name": "Jagdspieß",
-  "image": "systems/DSA_4-1/assets/arsenal/spear1.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Huntingspear.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/kampfstab.json b/src/packs/_source/Gegenstaende/Waffen/kampfstab.json
similarity index 100%
rename from src/packs/_source/waffen/kampfstab.json
rename to src/packs/_source/Gegenstaende/Waffen/kampfstab.json
diff --git a/src/packs/_source/waffen/keule.json b/src/packs/_source/Gegenstaende/Waffen/keule.json
similarity index 100%
rename from src/packs/_source/waffen/keule.json
rename to src/packs/_source/Gegenstaende/Waffen/keule.json
diff --git a/src/packs/_source/waffen/khunchomer.json b/src/packs/_source/Gegenstaende/Waffen/khunchomer.json
similarity index 100%
rename from src/packs/_source/waffen/khunchomer.json
rename to src/packs/_source/Gegenstaende/Waffen/khunchomer.json
diff --git a/src/packs/_source/waffen/knüppel.json b/src/packs/_source/Gegenstaende/Waffen/knüppel.json
similarity index 100%
rename from src/packs/_source/waffen/knüppel.json
rename to src/packs/_source/Gegenstaende/Waffen/knüppel.json
diff --git a/src/packs/_source/waffen/kompositbogen.json b/src/packs/_source/Gegenstaende/Waffen/kompositbogen.json
similarity index 100%
rename from src/packs/_source/waffen/kompositbogen.json
rename to src/packs/_source/Gegenstaende/Waffen/kompositbogen.json
diff --git a/src/packs/_source/waffen/kriegsbogen.json b/src/packs/_source/Gegenstaende/Waffen/kriegsbogen.json
similarity index 100%
rename from src/packs/_source/waffen/kriegsbogen.json
rename to src/packs/_source/Gegenstaende/Waffen/kriegsbogen.json
diff --git a/src/packs/_source/waffen/kriegshammer.json b/src/packs/_source/Gegenstaende/Waffen/kriegshammer.json
similarity index 100%
rename from src/packs/_source/waffen/kriegshammer.json
rename to src/packs/_source/Gegenstaende/Waffen/kriegshammer.json
diff --git a/src/packs/_source/waffen/kurzbogen.json b/src/packs/_source/Gegenstaende/Waffen/kurzbogen.json
similarity index 100%
rename from src/packs/_source/waffen/kurzbogen.json
rename to src/packs/_source/Gegenstaende/Waffen/kurzbogen.json
diff --git a/src/packs/_source/waffen/kurzschwert.json b/src/packs/_source/Gegenstaende/Waffen/kurzschwert.json
similarity index 100%
rename from src/packs/_source/waffen/kurzschwert.json
rename to src/packs/_source/Gegenstaende/Waffen/kurzschwert.json
diff --git a/src/packs/_source/waffen/kusliker-säbel.json b/src/packs/_source/Gegenstaende/Waffen/kusliker-säbel.json
similarity index 100%
rename from src/packs/_source/waffen/kusliker-säbel.json
rename to src/packs/_source/Gegenstaende/Waffen/kusliker-säbel.json
diff --git a/src/packs/_source/waffen/langbogen.json b/src/packs/_source/Gegenstaende/Waffen/langbogen.json
similarity index 100%
rename from src/packs/_source/waffen/langbogen.json
rename to src/packs/_source/Gegenstaende/Waffen/langbogen.json
diff --git a/src/packs/_source/waffen/langdolch.json b/src/packs/_source/Gegenstaende/Waffen/langdolch.json
similarity index 100%
rename from src/packs/_source/waffen/langdolch.json
rename to src/packs/_source/Gegenstaende/Waffen/langdolch.json
diff --git a/src/packs/_source/waffen/leichte-armbrust.json b/src/packs/_source/Gegenstaende/Waffen/leichte-armbrust.json
similarity index 95%
rename from src/packs/_source/waffen/leichte-armbrust.json
rename to src/packs/_source/Gegenstaende/Waffen/leichte-armbrust.json
index 0eca0b08..665b84e0 100644
--- a/src/packs/_source/waffen/leichte-armbrust.json
+++ b/src/packs/_source/Gegenstaende/Waffen/leichte-armbrust.json
@@ -1,5 +1,5 @@
 {
-  "name": "Eisenwalder",
+  "name": "Leichte Armbrust",
   "image": "systems/DSA_4-1/assets/Crossbows/SODA_Icons_Crossbow_26.png",
   "category": [
     "Gegenstand",
diff --git a/src/packs/_source/waffen/lindwurmschläger.json b/src/packs/_source/Gegenstaende/Waffen/lindwurmschläger.json
similarity index 100%
rename from src/packs/_source/waffen/lindwurmschläger.json
rename to src/packs/_source/Gegenstaende/Waffen/lindwurmschläger.json
diff --git a/src/packs/_source/waffen/magierstab.json b/src/packs/_source/Gegenstaende/Waffen/magierstab.json
similarity index 100%
rename from src/packs/_source/waffen/magierstab.json
rename to src/packs/_source/Gegenstaende/Waffen/magierstab.json
diff --git a/src/packs/_source/waffen/messer.json b/src/packs/_source/Gegenstaende/Waffen/messer.json
similarity index 100%
rename from src/packs/_source/waffen/messer.json
rename to src/packs/_source/Gegenstaende/Waffen/messer.json
diff --git a/src/packs/_source/waffen/morgenstern.json b/src/packs/_source/Gegenstaende/Waffen/morgenstern.json
similarity index 100%
rename from src/packs/_source/waffen/morgenstern.json
rename to src/packs/_source/Gegenstaende/Waffen/morgenstern.json
diff --git a/src/packs/_source/waffen/ochsenherde.json b/src/packs/_source/Gegenstaende/Waffen/ochsenherde.json
similarity index 87%
rename from src/packs/_source/waffen/ochsenherde.json
rename to src/packs/_source/Gegenstaende/Waffen/ochsenherde.json
index 3ab18418..07264af2 100644
--- a/src/packs/_source/waffen/ochsenherde.json
+++ b/src/packs/_source/Gegenstaende/Waffen/ochsenherde.json
@@ -1,6 +1,6 @@
 {
   "name": "Ochsenherde",
-  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_ChainWhip.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Flail.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/ogerschelle.json b/src/packs/_source/Gegenstaende/Waffen/ogerschelle.json
similarity index 95%
rename from src/packs/_source/waffen/ogerschelle.json
rename to src/packs/_source/Gegenstaende/Waffen/ogerschelle.json
index 4e9865be..d8a55bbd 100644
--- a/src/packs/_source/waffen/ogerschelle.json
+++ b/src/packs/_source/Gegenstaende/Waffen/ogerschelle.json
@@ -1,5 +1,5 @@
 {
-  "name": "Ochsenherde",
+  "name": "Ogerschelle",
   "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Whip.png",
   "category": [
     "Gegenstand",
diff --git a/src/packs/_source/waffen/orknase.json b/src/packs/_source/Gegenstaende/Waffen/orknase.json
similarity index 100%
rename from src/packs/_source/waffen/orknase.json
rename to src/packs/_source/Gegenstaende/Waffen/orknase.json
diff --git a/src/packs/_source/waffen/partisane.json b/src/packs/_source/Gegenstaende/Waffen/partisane.json
similarity index 100%
rename from src/packs/_source/waffen/partisane.json
rename to src/packs/_source/Gegenstaende/Waffen/partisane.json
diff --git a/src/packs/_source/waffen/rabenschnabel.json b/src/packs/_source/Gegenstaende/Waffen/rabenschnabel.json
similarity index 100%
rename from src/packs/_source/waffen/rabenschnabel.json
rename to src/packs/_source/Gegenstaende/Waffen/rabenschnabel.json
diff --git a/src/packs/_source/waffen/rapier.json b/src/packs/_source/Gegenstaende/Waffen/rapier.json
similarity index 100%
rename from src/packs/_source/waffen/rapier.json
rename to src/packs/_source/Gegenstaende/Waffen/rapier.json
diff --git a/src/packs/_source/waffen/schneidzahn.json b/src/packs/_source/Gegenstaende/Waffen/schneidzahn.json
similarity index 100%
rename from src/packs/_source/waffen/schneidzahn.json
rename to src/packs/_source/Gegenstaende/Waffen/schneidzahn.json
diff --git a/src/packs/_source/waffen/schwerer-dolch.json b/src/packs/_source/Gegenstaende/Waffen/schwerer-dolch.json
similarity index 100%
rename from src/packs/_source/waffen/schwerer-dolch.json
rename to src/packs/_source/Gegenstaende/Waffen/schwerer-dolch.json
diff --git a/src/packs/_source/waffen/schwert.json b/src/packs/_source/Gegenstaende/Waffen/schwert.json
similarity index 100%
rename from src/packs/_source/waffen/schwert.json
rename to src/packs/_source/Gegenstaende/Waffen/schwert.json
diff --git a/src/packs/_source/waffen/sense.json b/src/packs/_source/Gegenstaende/Waffen/sense.json
similarity index 100%
rename from src/packs/_source/waffen/sense.json
rename to src/packs/_source/Gegenstaende/Waffen/sense.json
diff --git a/src/packs/_source/waffen/sichel.json b/src/packs/_source/Gegenstaende/Waffen/sichel.json
similarity index 100%
rename from src/packs/_source/waffen/sichel.json
rename to src/packs/_source/Gegenstaende/Waffen/sichel.json
diff --git a/src/packs/_source/waffen/skraja.json b/src/packs/_source/Gegenstaende/Waffen/skraja.json
similarity index 100%
rename from src/packs/_source/waffen/skraja.json
rename to src/packs/_source/Gegenstaende/Waffen/skraja.json
diff --git a/src/packs/_source/waffen/speer.json b/src/packs/_source/Gegenstaende/Waffen/speer.json
similarity index 100%
rename from src/packs/_source/waffen/speer.json
rename to src/packs/_source/Gegenstaende/Waffen/speer.json
diff --git a/src/packs/_source/waffen/spitzhacke.json b/src/packs/_source/Gegenstaende/Waffen/spitzhacke.json
similarity index 100%
rename from src/packs/_source/waffen/spitzhacke.json
rename to src/packs/_source/Gegenstaende/Waffen/spitzhacke.json
diff --git a/src/packs/_source/waffen/stein-flasche.json b/src/packs/_source/Gegenstaende/Waffen/stein-flasche.json
similarity index 100%
rename from src/packs/_source/waffen/stein-flasche.json
rename to src/packs/_source/Gegenstaende/Waffen/stein-flasche.json
diff --git a/src/packs/_source/waffen/stoßspeer.json b/src/packs/_source/Gegenstaende/Waffen/stoßspeer.json
similarity index 100%
rename from src/packs/_source/waffen/stoßspeer.json
rename to src/packs/_source/Gegenstaende/Waffen/stoßspeer.json
diff --git a/src/packs/_source/waffen/streitaxt.json b/src/packs/_source/Gegenstaende/Waffen/streitaxt.json
similarity index 100%
rename from src/packs/_source/waffen/streitaxt.json
rename to src/packs/_source/Gegenstaende/Waffen/streitaxt.json
diff --git a/src/packs/_source/waffen/streitkolben.json b/src/packs/_source/Gegenstaende/Waffen/streitkolben.json
similarity index 100%
rename from src/packs/_source/waffen/streitkolben.json
rename to src/packs/_source/Gegenstaende/Waffen/streitkolben.json
diff --git a/src/packs/_source/waffen/stuhlbein.json b/src/packs/_source/Gegenstaende/Waffen/stuhlbein.json
similarity index 100%
rename from src/packs/_source/waffen/stuhlbein.json
rename to src/packs/_source/Gegenstaende/Waffen/stuhlbein.json
diff --git a/src/packs/_source/waffen/sturmsense.json b/src/packs/_source/Gegenstaende/Waffen/sturmsense.json
similarity index 100%
rename from src/packs/_source/waffen/sturmsense.json
rename to src/packs/_source/Gegenstaende/Waffen/sturmsense.json
diff --git a/src/packs/_source/waffen/säbel.json b/src/packs/_source/Gegenstaende/Waffen/säbel.json
similarity index 100%
rename from src/packs/_source/waffen/säbel.json
rename to src/packs/_source/Gegenstaende/Waffen/säbel.json
diff --git a/src/packs/_source/waffen/tuzakmesser.json b/src/packs/_source/Gegenstaende/Waffen/tuzakmesser.json
similarity index 100%
rename from src/packs/_source/waffen/tuzakmesser.json
rename to src/packs/_source/Gegenstaende/Waffen/tuzakmesser.json
diff --git a/src/packs/_source/waffen/vorschlaghammer.json b/src/packs/_source/Gegenstaende/Waffen/vorschlaghammer.json
similarity index 100%
rename from src/packs/_source/waffen/vorschlaghammer.json
rename to src/packs/_source/Gegenstaende/Waffen/vorschlaghammer.json
diff --git a/src/packs/_source/waffen/waqqif.json b/src/packs/_source/Gegenstaende/Waffen/waqqif.json
similarity index 100%
rename from src/packs/_source/waffen/waqqif.json
rename to src/packs/_source/Gegenstaende/Waffen/waqqif.json
diff --git a/src/packs/_source/waffen/warunker-hammer.json b/src/packs/_source/Gegenstaende/Waffen/warunker-hammer.json
similarity index 100%
rename from src/packs/_source/waffen/warunker-hammer.json
rename to src/packs/_source/Gegenstaende/Waffen/warunker-hammer.json
diff --git a/src/packs/_source/waffen/windenarmbrust.json b/src/packs/_source/Gegenstaende/Waffen/windenarmbrust.json
similarity index 95%
rename from src/packs/_source/waffen/windenarmbrust.json
rename to src/packs/_source/Gegenstaende/Waffen/windenarmbrust.json
index f7f3c0c1..57239593 100644
--- a/src/packs/_source/waffen/windenarmbrust.json
+++ b/src/packs/_source/Gegenstaende/Waffen/windenarmbrust.json
@@ -1,5 +1,5 @@
 {
-  "name": "Eisenwalder",
+  "name": "Windenarmbrust",
   "image": "systems/DSA_4-1/assets/Crossbows/SODA_Icons_Crossbow_48.png",
   "category": [
     "Gegenstand",
diff --git a/src/packs/_source/waffen/wurfbeil.json b/src/packs/_source/Gegenstaende/Waffen/wurfbeil.json
similarity index 100%
rename from src/packs/_source/waffen/wurfbeil.json
rename to src/packs/_source/Gegenstaende/Waffen/wurfbeil.json
diff --git a/src/packs/_source/waffen/wurfdolch.json b/src/packs/_source/Gegenstaende/Waffen/wurfdolch.json
similarity index 100%
rename from src/packs/_source/waffen/wurfdolch.json
rename to src/packs/_source/Gegenstaende/Waffen/wurfdolch.json
diff --git a/src/packs/_source/waffen/wurfmesser.json b/src/packs/_source/Gegenstaende/Waffen/wurfmesser.json
similarity index 100%
rename from src/packs/_source/waffen/wurfmesser.json
rename to src/packs/_source/Gegenstaende/Waffen/wurfmesser.json
diff --git a/src/packs/_source/waffen/wurfscheibe.json b/src/packs/_source/Gegenstaende/Waffen/wurfscheibe.json
similarity index 100%
rename from src/packs/_source/waffen/wurfscheibe.json
rename to src/packs/_source/Gegenstaende/Waffen/wurfscheibe.json
diff --git a/src/packs/_source/waffen/wurfspeer.json b/src/packs/_source/Gegenstaende/Waffen/wurfspeer.json
similarity index 100%
rename from src/packs/_source/waffen/wurfspeer.json
rename to src/packs/_source/Gegenstaende/Waffen/wurfspeer.json
diff --git a/src/packs/_source/waffen/wurmspieß.json b/src/packs/_source/Gegenstaende/Waffen/wurmspieß.json
similarity index 100%
rename from src/packs/_source/waffen/wurmspieß.json
rename to src/packs/_source/Gegenstaende/Waffen/wurmspieß.json
diff --git a/src/packs/_source/waffen/zweihänder.json b/src/packs/_source/Gegenstaende/Waffen/zweihänder.json
similarity index 100%
rename from src/packs/_source/waffen/zweihänder.json
rename to src/packs/_source/Gegenstaende/Waffen/zweihänder.json
diff --git a/src/packs/_source/waffen/zweililien.json b/src/packs/_source/Gegenstaende/Waffen/zweililien.json
similarity index 87%
rename from src/packs/_source/waffen/zweililien.json
rename to src/packs/_source/Gegenstaende/Waffen/zweililien.json
index 542724e2..29fd1324 100644
--- a/src/packs/_source/waffen/zweililien.json
+++ b/src/packs/_source/Gegenstaende/Waffen/zweililien.json
@@ -1,6 +1,6 @@
 {
   "name": "Zweililien",
-  "image": "systems/DSA_4-1/assets/Wands/SODA_Icons_Wand_39.png",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Doublespear.png",
   "category": [
     "Gegenstand",
     "Nahkampfwaffe"
diff --git a/src/packs/_source/waffen/zwergenschlägel.json b/src/packs/_source/Gegenstaende/Waffen/zwergenschlägel.json
similarity index 100%
rename from src/packs/_source/waffen/zwergenschlägel.json
rename to src/packs/_source/Gegenstaende/Waffen/zwergenschlägel.json
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Angelhaken.json b/src/packs/_source/Gegenstaende/Werkzeug/Angelhaken.json
new file mode 100644
index 00000000..d4a3c779
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Angelhaken.json
@@ -0,0 +1,9 @@
+{
+  "name": "Angelhaken mit Schnur",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 2
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Bogensehne.json b/src/packs/_source/Gegenstaende/Werkzeug/Bogensehne.json
new file mode 100644
index 00000000..c84c887f
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Bogensehne.json
@@ -0,0 +1,9 @@
+{
+  "name": "Bogensehne",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Dietriche.json b/src/packs/_source/Gegenstaende/Werkzeug/Dietriche.json
new file mode 100644
index 00000000..0dc33f43
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Dietriche.json
@@ -0,0 +1,9 @@
+{
+  "name": "Dietriche, Sortiment",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Key.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Federmesser.json b/src/packs/_source/Gegenstaende/Werkzeug/Federmesser.json
new file mode 100644
index 00000000..9b076feb
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Federmesser.json
@@ -0,0 +1,9 @@
+{
+  "name": "Federmesser",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Knife.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Fellgefuetteter-Schlafsack.json b/src/packs/_source/Gegenstaende/Werkzeug/Fellgefuetteter-Schlafsack.json
new file mode 100644
index 00000000..d4c88241
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Fellgefuetteter-Schlafsack.json
@@ -0,0 +1,9 @@
+{
+  "name": "Fellgefütterter Schlafsack",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Knife.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Fernrohr.json b/src/packs/_source/Gegenstaende/Werkzeug/Fernrohr.json
new file mode 100644
index 00000000..66882951
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Fernrohr.json
@@ -0,0 +1,9 @@
+{
+  "name": "Fernrohr",
+  "image": "systems/DSA_4-1/assets/Weapons/SODA_Icon_Weapons_Knife.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.25,
+  "price": 700
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Gaensekiel.json b/src/packs/_source/Gegenstaende/Werkzeug/Gaensekiel.json
new file mode 100644
index 00000000..b2cdd8d9
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Gaensekiel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Gänsekiel",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Feather.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 4
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Handspiegel.json b/src/packs/_source/Gegenstaende/Werkzeug/Handspiegel.json
new file mode 100644
index 00000000..6afd3807
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Handspiegel.json
@@ -0,0 +1,9 @@
+{
+  "name": "Handspiegel, versilbertes Glas",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Mirror.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 500
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Holzkamm.json b/src/packs/_source/Gegenstaende/Werkzeug/Holzkamm.json
new file mode 100644
index 00000000..d1658fda
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Holzkamm.json
@@ -0,0 +1,9 @@
+{
+  "name": "Holzkamm",
+  "image": "systems/DSA_4-1/assets/Nuts/SODA_Icons_Nut_10.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.1,
+  "price": 1
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Kletterhaken.json b/src/packs/_source/Gegenstaende/Werkzeug/Kletterhaken.json
new file mode 100644
index 00000000..5752a089
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Kletterhaken.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kletterhaken",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 2
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Nagelfeile.json b/src/packs/_source/Gegenstaende/Werkzeug/Nagelfeile.json
new file mode 100644
index 00000000..7d9564c8
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Nagelfeile.json
@@ -0,0 +1,9 @@
+{
+  "name": "Nagelfeile",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Rope.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 30
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Seife.json b/src/packs/_source/Gegenstaende/Werkzeug/Seife.json
new file mode 100644
index 00000000..0839f189
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Seife.json
@@ -0,0 +1,9 @@
+{
+  "name": "Seife",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 2
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Tabakpfeife.json b/src/packs/_source/Gegenstaende/Werkzeug/Tabakpfeife.json
new file mode 100644
index 00000000..74a51c36
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Tabakpfeife.json
@@ -0,0 +1,9 @@
+{
+  "name": "Tabakpfeife, Wurzelholz",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 100
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Tinte.json b/src/packs/_source/Gegenstaende/Werkzeug/Tinte.json
new file mode 100644
index 00000000..762ebcb2
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Tinte.json
@@ -0,0 +1,9 @@
+{
+  "name": "Tinte",
+  "image": "systems/DSA_4-1/assets/Potions_Herbs/SODA_Icon_PortionsHerbs_Potion_Red.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.1,
+  "price": 20
+}
\ No newline at end of file
diff --git a/src/packs/_source/Gegenstaende/Werkzeug/Waffenpflegeutensilien.json b/src/packs/_source/Gegenstaende/Werkzeug/Waffenpflegeutensilien.json
new file mode 100644
index 00000000..527bc985
--- /dev/null
+++ b/src/packs/_source/Gegenstaende/Werkzeug/Waffenpflegeutensilien.json
@@ -0,0 +1,9 @@
+{
+  "name": "Waffenpflegeutensilien",
+  "image": "systems/DSA_4-1/assets/Potions_Herbs/SODA_Icon_PortionsHerbs_Potion_Red.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1,
+  "price": 150
+}
\ No newline at end of file
diff --git a/src/style/molecules/_equipment.scss b/src/style/molecules/_equipment.scss
index 58866df8..c15a607e 100644
--- a/src/style/molecules/_equipment.scss
+++ b/src/style/molecules/_equipment.scss
@@ -4,7 +4,7 @@
   position: relative;
   height: 32px;
   display: grid;
-  grid-template-columns: 32px 24px 1fr 48px;
+  grid-template-columns: 32px 24px 1fr 80px;
   grid-template-rows: 1fr;
   padding: 2px 0 0 2px;
   margin: 4px 0 0 4px;
diff --git a/src/style/molecules/_weights.scss b/src/style/molecules/_weights.scss
new file mode 100644
index 00000000..2396cf9f
--- /dev/null
+++ b/src/style/molecules/_weights.scss
@@ -0,0 +1,24 @@
+@use "../atoms/assets";
+
+.weight {
+
+  .stone {
+    padding-right: 4px;
+
+    &::after {
+      padding-left: 2px;
+      content: 'Kg';
+      display: inline-block;
+    }
+  }
+
+  .ounces {
+    padding-right: 4px;
+
+    &::after {
+      padding-left: 2px;
+      content: 'oz';
+      display: inline-block;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/style/styles.scss b/src/style/styles.scss
index c67b1bae..d2a1795f 100644
--- a/src/style/styles.scss
+++ b/src/style/styles.scss
@@ -9,6 +9,7 @@
 @use "molecules/rows-and-columns";
 @use "molecules/sheet-header";
 @use "molecules/coins";
+@use "molecules/weights";
 
 @use "molecules/tabs";
 @use "molecules/paperdoll";
diff --git a/src/system.json b/src/system.json
index 16e3de17..6e09363e 100644
--- a/src/system.json
+++ b/src/system.json
@@ -26,7 +26,7 @@
   ],
   "packs": [
     {
-      "name": "talente",
+      "name": "Skills",
       "label": "Talente",
       "system": "DSA_4-1",
       "type": "Item",
@@ -34,7 +34,7 @@
       "private": false
     },
     {
-      "name": "spells",
+      "name": "Spells",
       "label": "Zauber",
       "system": "DSA_4-1",
       "type": "Item",
@@ -42,14 +42,14 @@
       "private": false
     },
     {
-      "name": "liturgien",
+      "name": "Liturgies",
       "label": "Liturgien",
       "system": "DSA_4-1",
       "type": "Item",
       "path": "packs/liturgien"
     },
     {
-      "name": "sonderfertigkeiten",
+      "name": "SpecialAbilities",
       "label": "Sonderfertigkeiten",
       "system": "DSA_4-1",
       "type": "Item",
@@ -71,6 +71,14 @@
       "path": "packs/waehrungen",
       "private": false
     },
+    {
+      "name": "Items",
+      "label": "Gegenstände",
+      "system": "DSA_4-1",
+      "type": "Item",
+      "path": "packs/Gegenstaende",
+      "private": false
+    },
     {
       "name": "Weapons",
       "label": "Waffen",
@@ -128,6 +136,43 @@
       "private": false
     }
   ],
+  "packFolders": [
+    {
+      "name": "Charakterdaten",
+      "sorting": "m",
+      "color": "#343c33",
+      "packs": [
+        "Species",
+        "Cultures",
+        "Professions",
+        "Advantage",
+        "SpecialAbilities",
+        "Skills"
+      ],
+      "folders": []
+    },
+    {
+      "name": "Übernatürliches",
+      "sorting": "m",
+      "color": "#3392ad",
+      "packs": [
+        "Spells",
+        "Liturgies"
+      ],
+      "folders": []
+    },
+    {
+      "name": "Rüstkammer",
+      "sorting": "m",
+      "color": "#ad0000",
+      "packs": [
+        "Weapons",
+        "Armor",
+        "Ammunition"
+      ],
+      "folders": []
+    }
+  ],
   "languages": [
     {
       "lang": "de",
@@ -300,7 +345,7 @@
   "socket": false,
   "initiative": "1d6",
   "grid": {
-    "distance": 10,
+    "distance": 1,
     "units": "Schritt"
   },
   "primaryTokenAttribute": "lep.aktuell",
diff --git a/src/templates/item/equipment/tab-meta.hbs b/src/templates/item/equipment/tab-meta.hbs
index 8bbcf645..d646c179 100644
--- a/src/templates/item/equipment/tab-meta.hbs
+++ b/src/templates/item/equipment/tab-meta.hbs
@@ -28,10 +28,10 @@
         </div>
         <div class="bottomline">
             <label class="named-value"><span>Preis (Silbertaler)</span>
-                <input type="number" name="system.price" value="{{price}}"/>
+                <input type="number" name="system.price" value="{{this.price}}"/>
             </label>
             <label class="named-value"><span>Gewicht (in Stein)</span>
-                <input type="number" name="system.weight" value="{{weight}}"/>
+                <input type="number" name="system.weight" value="{{this.weight}}"/>
             </label>
         </div>
     </div>
diff --git a/src/templates/ui/partial-equipment-button.hbs b/src/templates/ui/partial-equipment-button.hbs
index 87898b6b..95c62fb6 100644
--- a/src/templates/ui/partial-equipment-button.hbs
+++ b/src/templates/ui/partial-equipment-button.hbs
@@ -5,7 +5,7 @@
             <img src="{{this.icon}}" class="icon" alt=""/>
             <input class="quantity" type="number" value="{{this.quantity}}"/>
             <span class="name" data-item-id="{{this.id}}" data-action="openEmbeddedDocument">× {{this.name}}</span>
-            <span class="weight">{{this.weight}}</span>
+            <span class="weight">{{weight this.weight}}</span>
         </div>
     {{/each}}