diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23844dc..fa627d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,4 +3,5 @@
 # 0.02
 - Kritische Tabellen
 # 0.03
-- Standardwürfel
\ No newline at end of file
+- Makros für Standardwürfel (W6. W20. W100)
+- Blaupausen für Spielerffiguren und Nichtspielerfiguren
\ No newline at end of file
diff --git a/packs/actors/blaupause-spielfiguren.db b/packs/actors/blaupause-spielfiguren.db
new file mode 100644
index 0000000..cbc0b22
--- /dev/null
+++ b/packs/actors/blaupause-spielfiguren.db
@@ -0,0 +1,2 @@
+{"_id":"9d4uk6kRSl6R3RQW","name":"Blaupause NSpF","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"npc","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.midgard5.blaupause-spielfiguren.UZ24J3Izksd0gNfR"}},"img":"icons/svg/wing.svg","token":{"flags":{},"name":"Blaupause NSpF","displayName":30,"img":"icons/svg/wing.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"9d4uk6kRSl6R3RQW","actorLink":true,"disposition":-1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]}
+{"_id":"FeM5qp9YncZX61nj","name":"Blaupause Spielerfigur","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"character","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.world.blaupause-spielfiguren.t9eB2RdE1n9wV8eq"}},"img":"icons/svg/aura.svg","token":{"flags":{},"name":"Blaupause Spielfigur","displayName":30,"img":"icons/svg/aura.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"FeM5qp9YncZX61nj","actorLink":true,"disposition":1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]}
diff --git a/packs/makros-kritische-ereignisse.db b/packs/macros/makros-kritische-ereignisse.db
similarity index 100%
rename from packs/makros-kritische-ereignisse.db
rename to packs/macros/makros-kritische-ereignisse.db
diff --git a/packs/makros-standardwurfel.db b/packs/macros/makros-standardwurfel.db
similarity index 100%
rename from packs/makros-standardwurfel.db
rename to packs/macros/makros-standardwurfel.db
diff --git a/packs/tabellen-kritische-ereignisse.db b/packs/rolltables/tabellen-kritische-ereignisse.db
similarity index 100%
rename from packs/tabellen-kritische-ereignisse.db
rename to packs/rolltables/tabellen-kritische-ereignisse.db
diff --git a/system.json b/system.json
index eb62244..a588a57 100644
--- a/system.json
+++ b/system.json
@@ -14,22 +14,28 @@
       "midgard5.css"
     ], 
     "packs": [
+      {
+        "name": "blaupause-spielfiguren",
+        "label": "Blaupausen für Spielfiguren",
+        "path": "./packs/actors/blaupause-spielfiguren.db",
+        "entity": "Actor"
+      },
       {
         "name": "tabellen-kritische-ereignisse",
         "label": "Tabellen Kritische Ereignisse",
-        "path": "./packs/tabellen-kritische-ereignisse.db",
+        "path": "./packs/rolltables/tabellen-kritische-ereignisse.db",
         "entity": "RollTable"
       },
       {
         "name": "makros-kritische-ereignisse",
         "label": "Makros Kritische Ereignisse",
-        "path": "./packs/makros-kritische-ereignisse.db",
+        "path": "./packs/macros/makros-kritische-ereignisse.db",
         "entity": "Macro"
       },
       {
         "name": "makros-standardwurfel",
         "label": "Standardwürfel",
-        "path": "./packs/makros-standardwurfel.db",
+        "path": "./packs/macros/makros-standardwurfel.db",
         "entity": "Macro"
       } 
     ],
diff --git a/template.json b/template.json
index 515f860..7fa96eb 100644
--- a/template.json
+++ b/template.json
@@ -10,14 +10,14 @@
         },
         "characterBars":{
             "lp":{
-               "value":10,
+               "value":15,
                "min":0,
-               "max":10
+               "max":15
             },
             "ap":{
-               "value":5,
+               "value":20,
                "min":0,
-               "max":5
+               "max":20
             }
         },
         "attributes":{