diff --git a/example/environment.json b/example/environment.json
deleted file mode 100644
index 10a06a0..0000000
--- a/example/environment.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "meta": {
-    "name": "Environment Example",
-    "type": "environment"
-  },
-  "deck": [
-    {"count": 1, "keywords": "Ongoing", "name": "Example Card 1", "text": "Card text 1", "hp": 12, "artist": "Art By Adam", "flavor": "Test flavor"},
-    {"count": 1, "keywords": "Oneshot", "name": "Example Card 2", "text": "Card text 2"}]
-}
diff --git a/example/environment.yaml b/example/environment.yaml
new file mode 100644
index 0000000..26d08a8
--- /dev/null
+++ b/example/environment.yaml
@@ -0,0 +1,16 @@
+meta:
+  name: Environment Example
+  type: environment
+cards:
+  deck:
+    - keywords: Ongoing
+      name: Example Card 1
+      text: Card text 1
+      hp: 12
+      artist: Art By Adam
+      flavor: Test flavor
+    - count: 2
+      keywords: Oneshot
+      name: Example Card 2
+      text: Card text 2
+
diff --git a/example/hero.json b/example/hero.json
deleted file mode 100644
index 10ddaeb..0000000
--- a/example/hero.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "meta": {
-    "name": "Hero Example",
-    "type": "hero"
-  },
-  "character": [{"name": "Hero Example",
-				 "hp": 42,
-				 "power": "Power Name",
-				 "powerText": "Power: Power description",
-				 "incapacitated": "{incapacitated effect 1\n\n{incapacitated effect 2"}],
-  "deck": [
-	{"count": 1, "keywords": "Ongoing", "name": "Card 1", "text": "Card text 1", "hp": 12, "artist": "Art By Adam", "quote": "Test Quote", "quoteCitation": "- Adam"},
-	{"count": 2, "keywords": "Oneshot", "name": "Card 2", "text": "Card text 2"}
-  ]
-}
diff --git a/example/hero.yaml b/example/hero.yaml
new file mode 100644
index 0000000..047d1db
--- /dev/null
+++ b/example/hero.yaml
@@ -0,0 +1,24 @@
+meta:
+  name: Hero Example
+  type: hero
+cards:
+  character:
+  - name: Hero Example
+    hp: 42
+    power: Power Name
+    powerText: 'Power: Power description'
+    incapacitated: |-
+      <p>{incapacitated effect 1</p>
+      <p>{incapacitated effect 2</p>
+  deck:
+  - name: Card 1
+    hp: 12
+    keywords: Ongoing
+    text: Card text 1
+    quote: Test Quote
+    quoteCitation: "- Adam"
+    artist: Art By Adam
+  - count: 2
+    name: Card 2
+    keywords: Oneshot
+    text: Card text 2
diff --git a/example/villain.json b/example/villain.json
deleted file mode 100644
index 1266a6c..0000000
--- a/example/villain.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "meta": {
-    "name": "Villain Example",
-    "type": "villain"
-  },
-  "character": [
-    {"name": "Villain Example",
-     "hp": 32,
-     "title": "Test Front",
-     "back": {
-       "hp": 25,
-       "title": "Test Back"
-     }}],
-  "instructions": [
-    {"name": "Test",
-     "title": "Test Front",
-     "setup": "setup text",
-     "gameplay": "front text",
-     "advanced": "advanced front",
-     "back": {
-       "title": "Test Back",
-       "gameplay": "back text",
-       "advanced": "advanced back"
-     }}],
-  "deck": [
-    {"count": 1, "keywords": "Ongoing", "name": "Test 1", "text": "Example Text 1", "hp": 12, "artist": "Art By Adam", "quote": "Test Quote", "quoteCitation": "- Adam"},
-    {"count": 2, "keywords": "One-shot", "name": "Test 2", "text": "Example Text 2"}
-  ]
-}
diff --git a/example/villain.yaml b/example/villain.yaml
new file mode 100644
index 0000000..0da1d9b
--- /dev/null
+++ b/example/villain.yaml
@@ -0,0 +1,34 @@
+meta:
+  name: Villain Example
+  type: villain
+cards:
+  character:
+  - name: Villain Example
+    hp: 32
+    title: Test Front
+    back:
+      hp: 25
+      title: Test Back
+  instructions:
+  - name: Test
+    title: Test Front
+    setup: setup text
+    gameplay: front text
+    advanced: advanced front
+    back:
+      title: Test Back
+      gameplay: back text
+      advanced: advanced back
+  deck:
+  - keywords: Ongoing
+    name: Test 1
+    text: Example Text 1
+    hp: 12
+    artist: Art By Adam
+    quote: Test Quote
+    quoteCitation: "- Adam"
+  - count: 2
+    keywords: One-shot
+    name: Test 2
+    text: Example Text 2
+