diff --git a/README.org b/README.org
index d6230a7..2a32396 100644
--- a/README.org
+++ b/README.org
@@ -31,7 +31,7 @@ Or better yet, use something like [[https://github.com/raxod502/straight.el][str
    '(el-patch :type git :host gitlab :repo "howardabrams/emacs-rpgdm"))
 
   (straight-use-package
-   '(el-patch :type git :host gitlab :repo "howardabrams/emacs-ironsworn"))
+   '(el-patch :type git :host gitlab :repo "howardabrams/rpgdm-ironsworn"))
 #+END_SRC
 
 Next, create an org file, and either turn on the =rpgdm-mode= (minor mode), or simply define a globally accessible shortcut:
@@ -146,7 +146,7 @@ We also need the name of the directory for this project, so that we can load tab
 
 #+BEGIN_SRC emacs-lisp
     (defvar rpgdm-ironsworn-project (file-name-directory load-file-name)
-      "The root directory to the emacs-ironsworn project")
+      "The root directory to the rpgdm-ironsworn project")
 #+END_SRC
 ** Dice Roller
 In *Ironsworn*, all dice rolls follow a pattern where you set the challenge level for a check by rolling /challenge dice/ (two d10s) and compare that against rolling an /action die/ (a single d6 ... adding all modifiers to that six-sided die). You always three possible values:
@@ -954,8 +954,8 @@ This function displays an entry from both the [[file:tables/actions.org][actions
   (defun rpgdm-ironsworn-oracle-action-theme ()
     "Rolls on two tables at one time."
     (interactive)
-    (let ((action (rpgdm-tables-choose "actions"))
-          (theme  (rpgdm-tables-choose "themes")))
+    (let ((action (rpgdm-tables-choose "action"))
+          (theme  (rpgdm-tables-choose "theme")))
       (rpgdm-message "%s / %s" action theme)))
 
   (puthash "action-and-theme :: Roll on both tables"
@@ -970,12 +970,12 @@ This function display a single entry of all the character-specific tables, inclu
     "Roll on all the character-related tables and show them together.
   You'll need to pick and choose what works and discard what doesn't."
     (interactive)
-    (let ((name        (rpgdm-tables-choose "names-ironlander"))
-          (goal        (rpgdm-tables-choose "character-goal"))
-          (role        (rpgdm-tables-choose "character-role"))
-          (activity    (rpgdm-tables-choose "character-activity"))
-          (description (rpgdm-tables-choose "character-descriptor"))
-          (disposition (rpgdm-tables-choose "character-disposition")))
+    (let ((name        (rpgdm-tables-choose "name/ironlander"))
+          (goal        (rpgdm-tables-choose "character/goal"))
+          (role        (rpgdm-tables-choose "character/role"))
+          (activity    (rpgdm-tables-choose "character/activity"))
+          (description (rpgdm-tables-choose "character/descriptor"))
+          (disposition (rpgdm-tables-choose "character/disposition")))
       (rpgdm-message "%s, %s %s (Activity: %s  Disposition: %s  Goal: %s)"
                      name description role activity disposition goal)))
 
@@ -1010,8 +1010,8 @@ This function combines the [[file:tables/feature-aspect.org][aspect]] and [[file
   (defun rpgdm-ironsworn-oracle-feature ()
     "Rolls on two tables at one time for a Site's feature."
     (interactive)
-    (let ((aspect (rpgdm-tables-choose "feature-aspect"))
-          (focus  (rpgdm-tables-choose "feature-focus")))
+    (let ((aspect (rpgdm-tables-choose "feature/aspect"))
+          (focus  (rpgdm-tables-choose "feature/focus")))
       (rpgdm-message "%s / %s" aspect focus)))
 
   (puthash "feature-aspect-and-focus :: Roll on both feature tables"
@@ -1024,7 +1024,7 @@ And a Waypoint is similar:
   (defun rpgdm-ironsworn-oracle-waypoint ()
     "Rolls on two tables at one time for a Site's feature."
     (interactive)
-    (let ((location     (rpgdm-tables-choose "locations"))
+    (let ((location     (rpgdm-tables-choose "location"))
           (description  (rpgdm-tables-choose "location-descriptors")))
       (rpgdm-message "%s %s" description (downcase location))))
 
@@ -1042,8 +1042,8 @@ Notice we also generate a name for the place.
   (defun rpgdm-ironsworn-oracle-site-nature ()
     "Rolls on two tables at one time for a random Site."
     (interactive)
-    (let* ((theme  (rpgdm-tables-choose "site-theme"))
-           (domain (rpgdm-tables-choose "site-domain"))
+    (let* ((theme  (rpgdm-tables-choose "site/theme"))
+           (domain (rpgdm-tables-choose "site/domain"))
            (place  (downcase domain))
            (name   (rpgdm-ironsworn-oracle-site-name place)))
       (rpgdm-message "%s %s :: %s" theme domain name)))
@@ -1060,14 +1060,14 @@ Requires a =place-type= to help limit the values that can be in /place/ and then
     "Rolling on multiple tables to return a random site name."
     (interactive (list (completing-read "Place type: "
                                         '(barrow cavern icereach mine pass ruin
-                                                 sea-cave shadowfen stronghold
-                                                 tanglewood underkeep))))
+                                          sea-cave shadowfen stronghold
+                                          tanglewood underkeep))))
     (unless place-type
       (setq place-type "unknown"))
-    (let ((description (rpgdm-tables-choose "site-name-description"))
-          (detail (rpgdm-tables-choose "site-name-detail"))
-          (namesake (rpgdm-tables-choose "site-name-namesake"))
-          (place  (rpgdm-tables-choose (format "site-name-place-%s" place-type)))
+    (let ((description (rpgdm-tables-choose "site/name/description"))
+          (detail (rpgdm-tables-choose "site/name/detail"))
+          (namesake (rpgdm-tables-choose "site/name/namesake"))
+          (place  (rpgdm-tables-choose (format "site/name/place/%s" place-type)))
           (roll   (rpgdm--roll-die 100)))
       (rpgdm-message
        (cond
@@ -1114,7 +1114,7 @@ Generate a random threat and its motivations by coding the threat, but using the
     (interactive (list (completing-read "Threat: " rpgdm-ironsworn-oracle-threats)))
     (unless category
       (setq category (seq-random-elt rpgdm-ironsworn-oracle-threats)))
-    (let ((table-name (format "threat-%s" (downcase (string-replace " " "-" category)))))
+    (let ((table-name (format "threat/%s" (downcase (string-replace " " "-" category)))))
       (rpgdm-message "%s: %s" category (rpgdm-tables-choose table-name))))
 
   (puthash "threat-goal :: Generate a goal for a particular threat"
diff --git a/example.org b/example.org
index 0be49fd..28a60e5 100644
--- a/example.org
+++ b/example.org
@@ -5,7 +5,7 @@
 #+TAGS:   rpg ironsworn
 
 # Local Variables:
-# eval: (progn (require 'rpgdm-ironsworn) (rpgdm-mode) (rpgdm-tables-load (concat rpgdm-ironsworn-project "tables")))
+# eval: (progn (require 'rpgdm-ironsworn) (rpgdm-mode) (rpgdm-tables-load (concat rpgdm-ironsworn-project "tables"))
 # End:
 * Travels of Kannan
 :PROPERTIES:
diff --git a/rpgdm-ironsworn.el b/rpgdm-ironsworn.el
index 10bfea9..cfa109c 100644
--- a/rpgdm-ironsworn.el
+++ b/rpgdm-ironsworn.el
@@ -4,7 +4,7 @@
 (require 'rpgdm)
 
 (defvar rpgdm-ironsworn-project (file-name-directory load-file-name)
-  "The root directory to the emacs-ironsworn project")
+  "The root directory to the rpgdm-ironsworn project")
 
 (defun rpgdm-ironsworn--results (action modifier one-challenge two-challenge
                                  &optional momentum)
@@ -528,8 +528,8 @@ to rolling two d10 challenge dice."
 (defun rpgdm-ironsworn-oracle-action-theme ()
   "Rolls on two tables at one time."
   (interactive)
-  (let ((action (rpgdm-tables-choose "actions"))
-        (theme  (rpgdm-tables-choose "themes")))
+  (let ((action (rpgdm-tables-choose "action"))
+        (theme  (rpgdm-tables-choose "theme")))
     (rpgdm-message "%s / %s" action theme)))
 
 (puthash "action-and-theme :: Roll on both tables"
@@ -540,12 +540,12 @@ to rolling two d10 challenge dice."
   "Roll on all the character-related tables and show them together.
 You'll need to pick and choose what works and discard what doesn't."
   (interactive)
-  (let ((name        (rpgdm-tables-choose "names-ironlander"))
-        (goal        (rpgdm-tables-choose "character-goal"))
-        (role        (rpgdm-tables-choose "character-role"))
-        (activity    (rpgdm-tables-choose "character-activity"))
-        (description (rpgdm-tables-choose "character-descriptor"))
-        (disposition (rpgdm-tables-choose "character-disposition")))
+  (let ((name        (rpgdm-tables-choose "name/ironlander"))
+        (goal        (rpgdm-tables-choose "character/goal"))
+        (role        (rpgdm-tables-choose "character/role"))
+        (activity    (rpgdm-tables-choose "character/activity"))
+        (description (rpgdm-tables-choose "character/descriptor"))
+        (disposition (rpgdm-tables-choose "character/disposition")))
     (rpgdm-message "%s, %s %s (Activity: %s  Disposition: %s  Goal: %s)"
                    name description role activity disposition goal)))
 
@@ -565,18 +565,28 @@ You'll need to pick and choose what works and discard what doesn't."
 (defun rpgdm-ironsworn-oracle-feature ()
   "Rolls on two tables at one time for a Site's feature."
   (interactive)
-  (let ((aspect (rpgdm-tables-choose "feature-aspect"))
-        (focus  (rpgdm-tables-choose "feature-focus")))
+  (let ((aspect (rpgdm-tables-choose "feature/aspect"))
+        (focus  (rpgdm-tables-choose "feature/focus")))
     (rpgdm-message "%s / %s" aspect focus)))
 
-(puthash "feature-aspect-and-focus :: Roll on both feature tables for a waypoint"
+(puthash "feature-aspect-and-focus :: Roll on both feature tables"
          'rpgdm-ironsworn-oracle-feature rpgdm-tables)
 
+(defun rpgdm-ironsworn-oracle-waypoint ()
+  "Rolls on two tables at one time for a Site's feature."
+  (interactive)
+  (let ((location     (rpgdm-tables-choose "location"))
+        (description  (rpgdm-tables-choose "location-descriptors")))
+    (rpgdm-message "%s %s" description (downcase location))))
+
+(puthash "location-and-descriptor :: Roll on two tables for a waypoint"
+         'rpgdm-ironsworn-oracle-waypoint rpgdm-tables)
+
 (defun rpgdm-ironsworn-oracle-site-nature ()
   "Rolls on two tables at one time for a random Site."
   (interactive)
-  (let* ((theme  (rpgdm-tables-choose "site-theme"))
-         (domain (rpgdm-tables-choose "site-domain"))
+  (let* ((theme  (rpgdm-tables-choose "site/theme"))
+         (domain (rpgdm-tables-choose "site/domain"))
          (place  (downcase domain))
          (name   (rpgdm-ironsworn-oracle-site-name place)))
     (rpgdm-message "%s %s :: %s" theme domain name)))
@@ -588,14 +598,14 @@ You'll need to pick and choose what works and discard what doesn't."
   "Rolling on multiple tables to return a random site name."
   (interactive (list (completing-read "Place type: "
                                       '(barrow cavern icereach mine pass ruin
-                                               sea-cave shadowfen stronghold
-                                               tanglewood underkeep))))
+                                        sea-cave shadowfen stronghold
+                                        tanglewood underkeep))))
   (unless place-type
     (setq place-type "unknown"))
-  (let ((description (rpgdm-tables-choose "site-name-description"))
-        (detail (rpgdm-tables-choose "site-name-detail"))
-        (namesake (rpgdm-tables-choose "site-name-namesake"))
-        (place  (rpgdm-tables-choose (format "site-name-place-%s" place-type)))
+  (let ((description (rpgdm-tables-choose "site/name/description"))
+        (detail (rpgdm-tables-choose "site/name/detail"))
+        (namesake (rpgdm-tables-choose "site/name/namesake"))
+        (place  (rpgdm-tables-choose (format "site/name/place/%s" place-type)))
         (roll   (rpgdm--roll-die 100)))
     (rpgdm-message
      (cond
@@ -622,7 +632,7 @@ You'll need to pick and choose what works and discard what doesn't."
   (interactive (list (completing-read "Threat: " rpgdm-ironsworn-oracle-threats)))
   (unless category
     (setq category (seq-random-elt rpgdm-ironsworn-oracle-threats)))
-  (let ((table-name (format "threat-%s" (downcase (string-replace " " "-" category)))))
+  (let ((table-name (format "threat/%s" (downcase (string-replace " " "-" category)))))
     (rpgdm-message "%s: %s" category (rpgdm-tables-choose table-name))))
 
 (puthash "threat-goal :: Generate a goal for a particular threat"
diff --git a/tables/.DS_Store b/tables/.DS_Store
new file mode 100644
index 0000000..b847cae
Binary files /dev/null and b/tables/.DS_Store differ
diff --git a/tables/actions.org b/tables/action.org
similarity index 100%
rename from tables/actions.org
rename to tables/action.org
diff --git a/tables/character-activity.org b/tables/character/activity.org
similarity index 100%
rename from tables/character-activity.org
rename to tables/character/activity.org
diff --git a/tables/character-descriptor.org b/tables/character/descriptor.org
similarity index 100%
rename from tables/character-descriptor.org
rename to tables/character/descriptor.org
diff --git a/tables/character-disposition.org b/tables/character/disposition.org
similarity index 100%
rename from tables/character-disposition.org
rename to tables/character/disposition.org
diff --git a/tables/character-goal.org b/tables/character/goal.org
similarity index 100%
rename from tables/character-goal.org
rename to tables/character/goal.org
diff --git a/tables/character-role.org b/tables/character/role.org
similarity index 100%
rename from tables/character-role.org
rename to tables/character/role.org
diff --git a/tables/dangers.org b/tables/danger.org
similarity index 59%
rename from tables/dangers.org
rename to tables/danger.org
index 1a9f8df..95476b8 100644
--- a/tables/dangers.org
+++ b/tables/danger.org
@@ -5,15 +5,15 @@
 #+TAGS:   rpg table ironsworn
 
 Roll on Table: d100
-|  1-30 | Check the theme card.                                                                          |
-| 31-45 | Check the domain card.                                                                         |
-| 46-57 | You encounter a hostile denizen.                                                               |
-| 58-68 | You face an environmental or architectural hazard.                                             |
-| 69-76 | A discovery undermines or complicates your quest.                                              |
-| 77-79 | You confront a harrowing situation or sensation.                                               |
-| 80-82 | You face the consequences of an earlier choice or approach.                                    |
-| 83-85 | Your way is blocked or trapped.                                                                |
-| 86-88 | A resource is diminished, broken, or lost.                                                     |
-| 89-91 | You face a perplexing mystery or tough choice.                                                 |
-| 92-94 | You lose your way or are delayed.                                                              |
-| 95-00 | Roll twice more on this table. Both results occur. If they are the same result, make it worse. |
+|  1-30 | Check the theme card.                                       |
+| 31-45 | Check the domain card.                                      |
+| 46-57 | You encounter a hostile denizen.                            |
+| 58-68 | You face an environmental or architectural hazard.          |
+| 69-76 | A discovery undermines or complicates your quest.           |
+| 77-79 | You confront a harrowing situation or sensation.            |
+| 80-82 | You face the consequences of an earlier choice or approach. |
+| 83-85 | Your way is blocked or trapped.                             |
+| 86-88 | A resource is diminished, broken, or lost.                  |
+| 89-91 | You face a perplexing mystery or tough choice.              |
+| 92-94 | You lose your way or are delayed.                           |
+| 95-00 | Roll twice more on this table. Both results occur.          |
diff --git a/tables/danger/domain/barrow.org b/tables/danger/domain/barrow.org
new file mode 100644
index 0000000..016ba96
--- /dev/null
+++ b/tables/danger/domain/barrow.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Barrow
+
+ - Denizen guards this area
+ - Trap
+ - Death makes its presence known
+ - Crumbling architecture
+ - Grave goods with hidden dangers
diff --git a/tables/danger/domain/cavern.org b/tables/danger/domain/cavern.org
new file mode 100644
index 0000000..6da516b
--- /dev/null
+++ b/tables/danger/domain/cavern.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Barrow
+
+  - Denizen lairs here
+  - Cave-in
+  - Flooding
+  - Perilous climb or descent
+  - Fissure or sinkhole
diff --git a/tables/danger/domain/frozen-cavern.org b/tables/danger/domain/frozen-cavern.org
new file mode 100644
index 0000000..8e5c3c3
--- /dev/null
+++ b/tables/danger/domain/frozen-cavern.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Frozen Cavern
+
+  - Denizen lairs here
+  - Fracturing ice
+  - Crumbling chasm
+  - Bitter chill
+  - Disorienting reflections
diff --git a/tables/danger/domain/icereach.org b/tables/danger/domain/icereach.org
new file mode 100644
index 0000000..95b1d40
--- /dev/null
+++ b/tables/danger/domain/icereach.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers on an Icereach
+
+  - Denizen hunts
+  - Fragile ice above watery depths
+  - Perilous climb or descent
+  - Avalanche or icefall
+  - Foul weather
diff --git a/tables/danger/domain/mine.org b/tables/danger/domain/mine.org
new file mode 100644
index 0000000..9edfb0e
--- /dev/null
+++ b/tables/danger/domain/mine.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Mine
+
+  - Cave-in
+  - Flooding
+  - Unstable platforms or architecture
+  - Hazardous gas pocket
+  - Weakened terrain
diff --git a/tables/danger/domain/pass.org b/tables/danger/domain/pass.org
new file mode 100644
index 0000000..03b649d
--- /dev/null
+++ b/tables/danger/domain/pass.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers of a Pass
+
+  - Denizen lairs here
+  - Denizen hunts
+  - Perilous climb or descent
+  - Avalanche or rockslide
+  - Foul weather
diff --git a/tables/danger/domain/ruin.org b/tables/danger/domain/ruin.org
new file mode 100644
index 0000000..16c3449
--- /dev/null
+++ b/tables/danger/domain/ruin.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers found in Ruins
+
+  - Ancient mechanism or trap
+  - Collapsing wall or ceiling
+  - Blocked or broken passage
+  - Unstable floor above a new danger
+  - Ancient secrets best left buried
diff --git a/tables/danger/domain/sea-cave.org b/tables/danger/domain/sea-cave.org
new file mode 100644
index 0000000..c560da1
--- /dev/null
+++ b/tables/danger/domain/sea-cave.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers of a Sea Cave
+
+  - Denizen strikes without warning
+  - Denizen lurks below
+  - Flooding
+  - Rushing current
+  - Claustrophobic squeeze
diff --git a/tables/danger/domain/shadowfen.org b/tables/danger/domain/shadowfen.org
new file mode 100644
index 0000000..25881b8
--- /dev/null
+++ b/tables/danger/domain/shadowfen.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Shadowfen
+
+  - Denizen hunts
+  - Deep water blocks the path
+  - Toxic environment
+  - Concealing or disorienting mist
+  - Hidden quagmire
diff --git a/tables/danger/domain/stronghold.org b/tables/danger/domain/stronghold.org
new file mode 100644
index 0000000..13b97d5
--- /dev/null
+++ b/tables/danger/domain/stronghold.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Stronghold
+
+  - Blocked or guarded path
+  - Caught in the open
+  - Chokepoint
+  - Trap
+  - Alarm trigger
diff --git a/tables/danger/domain/tanglewood.org b/tables/danger/domain/tanglewood.org
new file mode 100644
index 0000000..bb9ab55
--- /dev/null
+++ b/tables/danger/domain/tanglewood.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers in a Tangled Wood
+
+  - Denizen hunts
+  - Denizen lairs here
+  - Trap or snare
+  - Path leads you astray
+  - Entangling plant life
diff --git a/tables/danger/domain/underkeep.org b/tables/danger/domain/underkeep.org
new file mode 100644
index 0000000..9c0c7b4
--- /dev/null
+++ b/tables/danger/domain/underkeep.org
@@ -0,0 +1,7 @@
+#+TITLE: Dangers of an Underkeep
+
+  - Ancient mechanism or trap
+  - Crumbling architecture
+  - Blocked or broken passage
+  - Artifact with a hidden danger
+  - Denizen lurks in darkness
diff --git a/tables/danger/theme/ancient.org b/tables/danger/theme/ancient.org
new file mode 100644
index 0000000..47b7f64
--- /dev/null
+++ b/tables/danger/theme/ancient.org
@@ -0,0 +1,16 @@
+#+TITLE: Dangers in an Ancient Location
+
+
+Roll on Table: d30
+  |   1-5 | Ancient trap                          |
+  |  6-10 | Hazardous architecture or terrain     |
+  | 11-12 | Blocked or broken path                |
+  | 13-14 | Denizen protects an ancient secret    |
+  | 15-16 | Denizen reveres an ancient power      |
+  | 17-18 | Living relics of a lost age           |
+  | 19-20 | Ancient evil resurgent                |
+  | 21-22 | Dire warnings of a long-buried danger |
+  | 23-24 | Ancient disease or contamination      |
+  | 25-26 | Artifact of terrible meaning or power |
+  | 27-28 | Disturbing evidence of ancient wrongs |
+  | 29-30 | Others seek power or knowledge        |
diff --git a/tables/danger/theme/corrupted.org b/tables/danger/theme/corrupted.org
new file mode 100644
index 0000000..e100aad
--- /dev/null
+++ b/tables/danger/theme/corrupted.org
@@ -0,0 +1,16 @@
+#+TITLE: Dangers in a Corrupted Location
+
+
+Roll on Table: d30
+  |   1-5 | Denizen spawned from dark magic       |
+  |  6-10 | Denizen controls dark magic           |
+  | 11-12 | Denizen corrupted by dark magic       |
+  | 13-14 | Corruption marks you                  |
+  | 15-16 | Innocents held in thrall              |
+  | 17-18 | Revelations of a terrible truth       |
+  | 19-20 | Mystic trap or trigger                |
+  | 21-22 | Mystic barrier or ward                |
+  | 23-24 | Illusions lead you astray             |
+  | 25-26 | Dark ritual in progress               |
+  | 27-28 | Lingering effects of a dark ritual    |
+  | 29-30 | Dread harbingers of a greater magic   |
diff --git a/tables/danger/theme/fortified.org b/tables/danger/theme/fortified.org
new file mode 100644
index 0000000..8d48bb6
--- /dev/null
+++ b/tables/danger/theme/fortified.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers in a Fortified Location
+
+Roll on Table: d30
+  |   1-5 | Denizen patrols the area         |
+  |  6-10 | Denizen on guard                 |
+  | 11-12 | Denizen ready to sound the alarm |
+  | 13-14 | Denizen sets an ambush           |
+  | 15-16 | Denizen lures you into a trap    |
+  | 17-18 | Denizens converge on this area   |
+  | 19-20 | Pets or underlings               |
+  | 21-22 | Unexpected alliance revealed     |
+  | 23-24 | Nefarious plans revealed         |
+  | 25-26 | Unexpected leader revealed       |
+  | 27-28 | Trap                             |
+  | 29-30 | Alarm trigger                    |
diff --git a/tables/danger/theme/hallowed.org b/tables/danger/theme/hallowed.org
new file mode 100644
index 0000000..c789c6c
--- /dev/null
+++ b/tables/danger/theme/hallowed.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers in a Hallowed Location
+
+Roll on Table: d30
+  |   1-5 | Denizen defends their sanctum        |
+  |  6-10 | Denizen enacts the will of their god |
+  | 11-12 | Denizen seeks martyrdom              |
+  | 13-14 | Secret of the faith is revealed      |
+  | 15-16 | Greater purpose is revealed          |
+  | 17-18 | Unexpected disciples are revealed    |
+  | 19-20 | Divine manifestations                |
+  | 21-22 | Aspect of the faith beguiles you     |
+  | 23-24 | Unexpected leader is revealed        |
+  | 25-26 | Embodiment of a god or myth          |
+  | 27-28 | Protective ward or barrier           |
+  | 29-30 | Prophecies reveal a dark fate        |
diff --git a/tables/danger/theme/haunted.org b/tables/danger/theme/haunted.org
new file mode 100644
index 0000000..e33d0e2
--- /dev/null
+++ b/tables/danger/theme/haunted.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers in a Haunted Place
+
+Roll on Table: d30
+  |   1-5 | Denizen haunts this area              |
+  |  6-10 | Unsettling sounds or foreboding signs |
+  | 11-12 | Denizen attacks without warning       |
+  | 13-14 | Denizen makes a costly demand         |
+  | 15-16 | Denizen seizes your body or mind      |
+  | 17-18 | Denizen taunts or lures you           |
+  | 19-20 | A disturbing truth is revealed        |
+  | 21-22 | Frightening visions                   |
+  | 23-24 | The environment is used against you   |
+  | 25-26 | Trickery leads you astray             |
+  | 27-28 | True nature of this place is revealed |
+  | 29-30 | Sudden, shocking manifestation        |
diff --git a/tables/danger/theme/infested.org b/tables/danger/theme/infested.org
new file mode 100644
index 0000000..1b24cc8
--- /dev/null
+++ b/tables/danger/theme/infested.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers in an Infested Location
+
+Roll on Table: d30
+  |   1-5 | Denizens swarm and attack             |
+  |  6-10 | Toxic or sickening environment        |
+  | 11-12 | Denizen stalks you                    |
+  | 13-14 | Denizen takes or destroys something   |
+  | 15-16 | Denizen reveals surprising cleverness |
+  | 17-18 | Denizen guided by a greater threat    |
+  | 19-20 | Denizen blocks the path               |
+  | 21-22 | Denizen funnels you down a new path   |
+  | 23-24 | Denizen undermines the path           |
+  | 25-26 | Denizen lays in wait                  |
+  | 27-28 | Trap or snare                         |
+  | 29-30 | Victim’s horrible fate is revealed    |
diff --git a/tables/danger/theme/ravaged.org b/tables/danger/theme/ravaged.org
new file mode 100644
index 0000000..e77f210
--- /dev/null
+++ b/tables/danger/theme/ravaged.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers of a Ravaged Land
+
+Roll on Table: d30
+  |   1-5 | Precarious architecture or terrain     |
+  |  6-10 | Imminent collapse or destruction       |
+  | 11-12 | Path undermined                        |
+  | 13-14 | Blocked or broken path                 |
+  | 15-16 | Vestiges of a destructive force        |
+  | 17-18 | Unexpected environmental threat        |
+  | 19-20 | Echoes of a troubling past             |
+  | 21-22 | Signs of a horrible fate               |
+  | 23-24 | Denizen seeks retribution              |
+  | 25-26 | Denizen leverages the environment      |
+  | 27-28 | Denizen restores what was lost         |
+  | 29-30 | Ravages return anew                    |
diff --git a/tables/danger/theme/wild.org b/tables/danger/theme/wild.org
new file mode 100644
index 0000000..84a6d8d
--- /dev/null
+++ b/tables/danger/theme/wild.org
@@ -0,0 +1,15 @@
+#+TITLE: Dangers of a Wild Place
+
+Roll on Table: d30
+  |   1-5 | Denizen hunts                          |
+  |  6-10 | Denizen strikes without warning        |
+  | 11-12 | Denizen leverages the environment      |
+  | 13-14 | Denizen wields unexpected abilities    |
+  | 15-16 | Denizen guided by a greater threat     |
+  | 17-18 | Denizen protects something             |
+  | 19-20 | Hazardous terrain                      |
+  | 21-22 | Weather or environmental threat        |
+  | 23-24 | Benign aspect becomes a threat         |
+  | 25-26 | Overzealous hunter                     |
+  | 27-28 | Disturbing evidence of a victim’s fate |
+  | 29-30 | Ill-fated victim in danger             |
diff --git a/tables/feature-aspect.org b/tables/feature/aspect.org
similarity index 100%
rename from tables/feature-aspect.org
rename to tables/feature/aspect.org
diff --git a/tables/feature/domain/barrow.org b/tables/feature/domain/barrow.org
new file mode 100644
index 0000000..f827ebc
--- /dev/null
+++ b/tables/feature/domain/barrow.org
@@ -0,0 +1,15 @@
+#+TITLE: Features of a Barrow
+
+Roll on Table: d80 + 20
+  | 21-43 | Burial chambers                  |
+  | 44-56 | Maze of narrow passages          |
+  | 57-64 | Shrine                           |
+  | 65-68 | Stately vault                    |
+  | 69-72 | Offerings to the dead            |
+  | 73-76 | Statuary or tapestries           |
+  | 77-80 | Remains of a grave robber        |
+  | 81-84 | Mass grave                       |
+  | 85-88 | Exhumed corpses                  |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/cavern.org b/tables/feature/domain/cavern.org
new file mode 100644
index 0000000..eabb047
--- /dev/null
+++ b/tables/feature/domain/cavern.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Cavern
+
+Roll on Table: d80 + 20
+  | 21-43 | Twisting passages                |
+  | 44-56 | Cramped caves                    |
+  | 57-64 | Vast chamber                     |
+  | 65-68 | Subterranean waterway            |
+  | 69-72 | Cave pool                        |
+  | 73-76 | Natural bridge                   |
+  | 77-80 | Towering stone formations        |
+  | 81-84 | Natural illumination             |
+  | 85-88 | Dark pit                         |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/frozen-cavern.org b/tables/feature/domain/frozen-cavern.org
new file mode 100644
index 0000000..ecf3bfb
--- /dev/null
+++ b/tables/feature/domain/frozen-cavern.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Frozen Cavern
+
+Roll on Table: d80 + 20
+  | 21-43 | Maze of icy tunnels              |
+  | 44-56 | Glistening cave                  |
+  | 57-64 | Vast chamber                     |
+  | 65-68 | Frigid waterway                  |
+  | 69-72 | Icy pools                        |
+  | 73-76 | Magnificent ice formations       |
+  | 77-80 | Frozen waterfall                 |
+  | 81-84 | Deep crevasses                   |
+  | 85-88 | Discovery locked in the ice      |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/icereach.org b/tables/feature/domain/icereach.org
new file mode 100644
index 0000000..23a9219
--- /dev/null
+++ b/tables/feature/domain/icereach.org
@@ -0,0 +1,15 @@
+#+TITLE: Features on an Icereach
+
+Roll on Table: d80 + 20
+  | 21-43 | Plains of ice and snow           |
+  | 44-56 | Seawater channel                 |
+  | 57-64 | Icy highlands                    |
+  | 65-68 | Crevasse                         |
+  | 69-72 | Ice floes                        |
+  | 73-76 | Ship trapped in ice              |
+  | 77-80 | Animal herd or habitat           |
+  | 81-84 | Frozen carcass                   |
+  | 85-88 | Camp or outpost                  |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/mine.org b/tables/feature/domain/mine.org
new file mode 100644
index 0000000..cd031c9
--- /dev/null
+++ b/tables/feature/domain/mine.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Mine
+
+Roll on Table: d80 + 20
+  | 21-43 | Cramped tunnels                  |
+  | 44-56 | Mine works                       |
+  | 57-64 | Excavated chamber                |
+  | 65-68 | Mineshaft                        |
+  | 69-72 | Collapsed tunnel                 |
+  | 73-76 | Cluttered storage                |
+  | 77-80 | Housing or common areas          |
+  | 81-84 | Flooded chamber                  |
+  | 85-88 | Unearthed secret                 |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/pass.org b/tables/feature/domain/pass.org
new file mode 100644
index 0000000..e343df2
--- /dev/null
+++ b/tables/feature/domain/pass.org
@@ -0,0 +1,15 @@
+#+TITLE: Features of a Pass
+
+Roll on Table: d80 + 20
+  | 21-43 | Winding mountain path            |
+  | 44-56 | Snowfield or glacial rocks       |
+  | 57-64 | River gorge                      |
+  | 65-68 | Crashing waterfall               |
+  | 69-72 | Highland lake                    |
+  | 73-76 | Forgotten cairn                  |
+  | 77-80 | Bridge                           |
+  | 81-84 | Overlook                         |
+  | 85-88 | Camp or outpost                  |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/ruin.org b/tables/feature/domain/ruin.org
new file mode 100644
index 0000000..26c2381
--- /dev/null
+++ b/tables/feature/domain/ruin.org
@@ -0,0 +1,15 @@
+#+TITLE: Features found in Ruins
+
+Roll on Table: d80 + 20
+  | 21-43 | Crumbling corridors and chambers |
+  | 44-56 | Collapsed architecture           |
+  | 57-64 | Rubble-choked hall               |
+  | 65-68 | Courtyard                        |
+  | 69-72 | Archive or library               |
+  | 73-76 | Broken statuary or fading murals |
+  | 77-80 | Preserved vault                  |
+  | 81-84 | Temple to forgotten gods         |
+  | 85-88 | Mausoleum                        |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/sea-cave.org b/tables/feature/domain/sea-cave.org
new file mode 100644
index 0000000..0c0afb5
--- /dev/null
+++ b/tables/feature/domain/sea-cave.org
@@ -0,0 +1,15 @@
+#+TITLE: Features of a Sea Cave
+
+Roll on Table: d80 + 20
+  | 21-43 | Watery tunnels                   |
+  | 44-56 | Eroded chamber                   |
+  | 57-64 | Flooded chamber                  |
+  | 65-68 | Vast chamber                     |
+  | 69-72 | Dry passages                     |
+  | 73-76 | Freshwater inlet                 |
+  | 77-80 | Rocky island                     |
+  | 81-84 | Waterborne debris                |
+  | 85-88 | Shipwreck or boat                |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/shadowfen.org b/tables/feature/domain/shadowfen.org
new file mode 100644
index 0000000..aa66270
--- /dev/null
+++ b/tables/feature/domain/shadowfen.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Shadowfen
+
+Roll on Table: d80 + 20
+  | 21-43 | Narrow path through a fetid bog  |
+  | 44-56 | Stagnant waterway                |
+  | 57-64 | Flooded thicket                  |
+  | 65-68 | Island of dry land               |
+  | 69-72 | Submerged discovery              |
+  | 73-76 | Preserved corpses                |
+  | 77-80 | Overgrown structure              |
+  | 81-84 | Tall reeds                       |
+  | 85-88 | Camp or outpost                  |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/stronghold.org b/tables/feature/domain/stronghold.org
new file mode 100644
index 0000000..fc68e86
--- /dev/null
+++ b/tables/feature/domain/stronghold.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Stronghold
+
+Roll on Table: d80 + 20
+  | 21-43 | Connecting passageways           |
+  | 44-56 | Barracks or common quarters      |
+  | 57-64 | Large hall                       |
+  | 65-68 | Workshop or library              |
+  | 69-72 | Command center or leadership     |
+  | 73-76 | Ladder or stairwell              |
+  | 77-80 | Storage                          |
+  | 81-84 | Kitchen or larder                |
+  | 85-88 | Courtyard                        |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/tanglewood.org b/tables/feature/domain/tanglewood.org
new file mode 100644
index 0000000..a49e639
--- /dev/null
+++ b/tables/feature/domain/tanglewood.org
@@ -0,0 +1,15 @@
+#+TITLE: Features in a Tangled Wood
+
+Roll on Table: d80 + 20
+  | 21-43 | Dense thicket                    |
+  | 44-56 | Overgrown path                   |
+  | 57-64 | Waterway                         |
+  | 65-68 | Clearing                         |
+  | 69-72 | Elder tree                       |
+  | 73-76 | Brambles                         |
+  | 77-80 | Overgrown structure              |
+  | 81-84 | Rocky outcrop                    |
+  | 85-88 | Camp or outpost                  |
+  | 89-98 | Something unusual or unexpected  |
+  |    99 | You transition into a new theme  |
+  |   100 | You transition into a new domain |
diff --git a/tables/feature/domain/underkeep.org b/tables/feature/domain/underkeep.org
new file mode 100644
index 0000000..d4cbce7
--- /dev/null
+++ b/tables/feature/domain/underkeep.org
@@ -0,0 +1,15 @@
+#+TITLE: Features of an Underkeep
+
+Roll on Table: d80 + 20
+  | 21-43 | Carved passages                   |
+  | 44-56 | Hall or chamber                   |
+  | 57-64 | Stairs into the depths            |
+  | 65-68 | Grand doorway or entrance         |
+  | 69-72 | Tomb or catacombs                 |
+  | 73-76 | Rough-hewn cave                   |
+  | 77-80 | Foundry or workshop               |
+  | 81-84 | Shrine or temple                  |
+  | 85-88 | Imposing architecture or artistry |
+  | 89-98 | Something unusual or unexpected   |
+  |    99 | You transition into a new theme   |
+  |   100 | You transition into a new domain  |
diff --git a/tables/feature-focus.org b/tables/feature/focus.org
similarity index 100%
rename from tables/feature-focus.org
rename to tables/feature/focus.org
diff --git a/tables/feature/theme/ancient.org b/tables/feature/theme/ancient.org
new file mode 100644
index 0000000..360de25
--- /dev/null
+++ b/tables/feature/theme/ancient.org
@@ -0,0 +1,9 @@
+#+TITLE: Features in an Ancient Location
+
+
+Roll on Table: d20
+  |   1-4 | Evidence of lost knowledge            |
+  |   5-8 | Inscrutable relics                    |
+  |  9-12 | Ancient artistry or craft             |
+  | 13-16 | Preserved corpses or fossils          |
+  | 17-20 | Visions of this place in another time |
diff --git a/tables/feature/theme/corrupted.org b/tables/feature/theme/corrupted.org
new file mode 100644
index 0000000..264fcb3
--- /dev/null
+++ b/tables/feature/theme/corrupted.org
@@ -0,0 +1,8 @@
+#+TITLE: Features in a Corrupted Location
+
+Roll on Table: d20
+  |   1-4 | Mystic focus or conduit               |
+  |   5-8 | Strange environmental disturbances    |
+  |  9-12 | Mystic runes or markings              |
+  | 13-16 | Blight or decay                       |
+  | 17-20 | Evidence of a foul ritual             |
diff --git a/tables/feature/theme/fortified.org b/tables/feature/theme/fortified.org
new file mode 100644
index 0000000..5731248
--- /dev/null
+++ b/tables/feature/theme/fortified.org
@@ -0,0 +1,8 @@
+#+TITLE: Features in a Fortified Location
+
+Roll on Table: d20
+  |   1-4 | Camp or quarters                     |
+  |   5-8 | Guarded location                     |
+  |  9-12 | Storage or repository                |
+  | 13-16 | Work or training area                |
+  | 17-20 | Command center or leadership         |
diff --git a/tables/feature/theme/hallowed.org b/tables/feature/theme/hallowed.org
new file mode 100644
index 0000000..83bb36a
--- /dev/null
+++ b/tables/feature/theme/hallowed.org
@@ -0,0 +1,8 @@
+#+TITLE: Features in a Hallowed Location
+
+Roll on Table: d20
+  |   1-4 | Temple or altar              |
+  |   5-8 | Offerings or atonements      |
+  |  9-12 | Religious relic or idol      |
+  | 13-16 | Consecrated ground           |
+  | 17-20 | Dwellings or gathering place |
diff --git a/tables/feature/theme/haunted.org b/tables/feature/theme/haunted.org
new file mode 100644
index 0000000..b452dab
--- /dev/null
+++ b/tables/feature/theme/haunted.org
@@ -0,0 +1,8 @@
+#+TITLE: Features in a Haunted Place
+
+Roll on Table: d20
+  |   1-4 | Tomb or burial site                   |
+  |   5-8 | Blood was spilled here                |
+  |  9-12 | Unnatural mists or darkness           |
+  | 13-16 | Messages from beyond the grave        |
+  | 17-20 | Apparitions of a person or event      |
diff --git a/tables/feature/theme/infested.org b/tables/feature/theme/infested.org
new file mode 100644
index 0000000..e540671
--- /dev/null
+++ b/tables/feature/theme/infested.org
@@ -0,0 +1,8 @@
+#+TITLE: Features in an Infested Location
+
+Roll on Table: d20
+  |   1-4 | Inhabited nest                        |
+  |   5-8 | Abandoned nest                        |
+  |  9-12 | Ravaged terrain or architecture       |
+  | 13-16 | Remains or carrion                    |
+  | 17-20 | Hoarded food                          |
diff --git a/tables/feature/theme/ravaged.org b/tables/feature/theme/ravaged.org
new file mode 100644
index 0000000..ad9d0e1
--- /dev/null
+++ b/tables/feature/theme/ravaged.org
@@ -0,0 +1,8 @@
+#+TITLE: Features of a Ravaged Land
+
+Roll on Table: d20
+  |   1-4 | Path of destruction                    |
+  |   5-8 | Abandoned or ruined dwelling           |
+  |  9-12 | Untouched or preserved area            |
+  | 13-16 | Traces of what was lost                |
+  | 17-20 | Ill-fated victims                      |
diff --git a/tables/feature/theme/wild.org b/tables/feature/theme/wild.org
new file mode 100644
index 0000000..cadd382
--- /dev/null
+++ b/tables/feature/theme/wild.org
@@ -0,0 +1,8 @@
+#+TITLE: Features of a Wild Place
+
+Roll on Table: d20
+  |   1-4 | Denizen’s lair                         |
+  |   5-8 | Territorial markings                   |
+  |  9-12 | Impressive flora or fauna              |
+  | 13-16 | Hunting ground or watering hole        |
+  | 17-20 | Remains or carrion                     |
diff --git a/tables/locations-coastal-waters.org b/tables/location-coastal-waters.org
similarity index 100%
rename from tables/locations-coastal-waters.org
rename to tables/location-coastal-waters.org
diff --git a/tables/locations.org b/tables/location.org
similarity index 100%
rename from tables/locations.org
rename to tables/location.org
diff --git a/tables/names-elf.org b/tables/name/elf.org
similarity index 100%
rename from tables/names-elf.org
rename to tables/name/elf.org
diff --git a/tables/names-giant.org b/tables/name/giant.org
similarity index 100%
rename from tables/names-giant.org
rename to tables/name/giant.org
diff --git a/tables/names-ironlander.org b/tables/name/ironlander.org
similarity index 100%
rename from tables/names-ironlander.org
rename to tables/name/ironlander.org
diff --git a/tables/names-troll.org b/tables/name/troll.org
similarity index 100%
rename from tables/names-troll.org
rename to tables/name/troll.org
diff --git a/tables/names-varou.org b/tables/name/varou.org
similarity index 100%
rename from tables/names-varou.org
rename to tables/name/varou.org
diff --git a/tables/regions.org b/tables/region.org
similarity index 100%
rename from tables/regions.org
rename to tables/region.org
diff --git a/tables/runes-augmented.org b/tables/rune-augmented.org
similarity index 100%
rename from tables/runes-augmented.org
rename to tables/rune-augmented.org
diff --git a/tables/runes.org b/tables/rune.org
similarity index 100%
rename from tables/runes.org
rename to tables/rune.org
diff --git a/tables/settlement-names.org b/tables/settlement/name.org
similarity index 100%
rename from tables/settlement-names.org
rename to tables/settlement/name.org
diff --git a/tables/settlement-prefix.org b/tables/settlement/prefix.org
similarity index 100%
rename from tables/settlement-prefix.org
rename to tables/settlement/prefix.org
diff --git a/tables/settlement-suffix.org b/tables/settlement/suffix.org
similarity index 100%
rename from tables/settlement-suffix.org
rename to tables/settlement/suffix.org
diff --git a/tables/settlement-trouble.org b/tables/settlement/trouble.org
similarity index 100%
rename from tables/settlement-trouble.org
rename to tables/settlement/trouble.org
diff --git a/tables/site-domain.org b/tables/site/domain.org
similarity index 100%
rename from tables/site-domain.org
rename to tables/site/domain.org
diff --git a/tables/site-name-description.org b/tables/site/name/description.org
similarity index 100%
rename from tables/site-name-description.org
rename to tables/site/name/description.org
diff --git a/tables/site-name-detail.org b/tables/site/name/detail.org
similarity index 100%
rename from tables/site-name-detail.org
rename to tables/site/name/detail.org
diff --git a/tables/site-name-namesake.org b/tables/site/name/namesake.org
similarity index 100%
rename from tables/site-name-namesake.org
rename to tables/site/name/namesake.org
diff --git a/tables/site-name-place-barrow.org b/tables/site/name/place/barrow.org
similarity index 100%
rename from tables/site-name-place-barrow.org
rename to tables/site/name/place/barrow.org
diff --git a/tables/site-name-place-cavern.org b/tables/site/name/place/cavern.org
similarity index 100%
rename from tables/site-name-place-cavern.org
rename to tables/site/name/place/cavern.org
diff --git a/tables/site-name-place-icereach.org b/tables/site/name/place/icereach.org
similarity index 100%
rename from tables/site-name-place-icereach.org
rename to tables/site/name/place/icereach.org
diff --git a/tables/site-name-place-mine.org b/tables/site/name/place/mine.org
similarity index 100%
rename from tables/site-name-place-mine.org
rename to tables/site/name/place/mine.org
diff --git a/tables/site-name-place-pass.org b/tables/site/name/place/pass.org
similarity index 100%
rename from tables/site-name-place-pass.org
rename to tables/site/name/place/pass.org
diff --git a/tables/site-name-place-ruin.org b/tables/site/name/place/ruin.org
similarity index 100%
rename from tables/site-name-place-ruin.org
rename to tables/site/name/place/ruin.org
diff --git a/tables/site-name-place-sea-cave.org b/tables/site/name/place/sea-cave.org
similarity index 100%
rename from tables/site-name-place-sea-cave.org
rename to tables/site/name/place/sea-cave.org
diff --git a/tables/site-name-place-shadowfen.org b/tables/site/name/place/shadowfen.org
similarity index 100%
rename from tables/site-name-place-shadowfen.org
rename to tables/site/name/place/shadowfen.org
diff --git a/tables/site-name-place-stronghold.org b/tables/site/name/place/stronghold.org
similarity index 100%
rename from tables/site-name-place-stronghold.org
rename to tables/site/name/place/stronghold.org
diff --git a/tables/site-name-place-tanglewood.org b/tables/site/name/place/tanglewood.org
similarity index 100%
rename from tables/site-name-place-tanglewood.org
rename to tables/site/name/place/tanglewood.org
diff --git a/tables/site-name-place-underkeep.org b/tables/site/name/place/underkeep.org
similarity index 100%
rename from tables/site-name-place-underkeep.org
rename to tables/site/name/place/underkeep.org
diff --git a/tables/site-name-place-unknown.org b/tables/site/name/place/unknown.org
similarity index 100%
rename from tables/site-name-place-unknown.org
rename to tables/site/name/place/unknown.org
diff --git a/tables/site-theme.org b/tables/site/theme.org
similarity index 100%
rename from tables/site-theme.org
rename to tables/site/theme.org
diff --git a/tables/themes.org b/tables/theme.org
similarity index 100%
rename from tables/themes.org
rename to tables/theme.org
diff --git a/tables/threat-burgeoning-conflict.org b/tables/threat/burgeoning-conflict.org
similarity index 100%
rename from tables/threat-burgeoning-conflict.org
rename to tables/threat/burgeoning-conflict.org
diff --git a/tables/threat-category.org b/tables/threat/category.org
similarity index 100%
rename from tables/threat-category.org
rename to tables/threat/category.org
diff --git a/tables/threat-cursed-site.org b/tables/threat/cursed-site.org
similarity index 100%
rename from tables/threat-cursed-site.org
rename to tables/threat/cursed-site.org
diff --git a/tables/threat-environmental-calamity.org b/tables/threat/environmental-calamity.org
similarity index 100%
rename from tables/threat-environmental-calamity.org
rename to tables/threat/environmental-calamity.org
diff --git a/tables/threat-malignant-plague.org b/tables/threat/malignant-plague.org
similarity index 100%
rename from tables/threat-malignant-plague.org
rename to tables/threat/malignant-plague.org
diff --git a/tables/threat-power-hungry-mystic.org b/tables/threat/power-hungry-mystic.org
similarity index 100%
rename from tables/threat-power-hungry-mystic.org
rename to tables/threat/power-hungry-mystic.org
diff --git a/tables/threat-rampaging-creature.org b/tables/threat/rampaging-creature.org
similarity index 100%
rename from tables/threat-rampaging-creature.org
rename to tables/threat/rampaging-creature.org
diff --git a/tables/threat-ravaging-horde.org b/tables/threat/ravaging-horde.org
similarity index 100%
rename from tables/threat-ravaging-horde.org
rename to tables/threat/ravaging-horde.org
diff --git a/tables/threat-scheming-leader.org b/tables/threat/scheming-leader.org
similarity index 100%
rename from tables/threat-scheming-leader.org
rename to tables/threat/scheming-leader.org
diff --git a/tables/threat-zealous-cult.org b/tables/threat/zealous-cult.org
similarity index 100%
rename from tables/threat-zealous-cult.org
rename to tables/threat/zealous-cult.org