diff --git a/plugins/util/namefiles/dever_f.nam b/plugins/data/namefiles/dever_f.nam
similarity index 100%
rename from plugins/util/namefiles/dever_f.nam
rename to plugins/data/namefiles/dever_f.nam
diff --git a/plugins/util/namefiles/dever_m.nam b/plugins/data/namefiles/dever_m.nam
similarity index 100%
rename from plugins/util/namefiles/dever_m.nam
rename to plugins/data/namefiles/dever_m.nam
diff --git a/plugins/util/namefiles/dragon.nam b/plugins/data/namefiles/dragon.nam
similarity index 100%
rename from plugins/util/namefiles/dragon.nam
rename to plugins/data/namefiles/dragon.nam
diff --git a/plugins/util/namefiles/dwarves.nam b/plugins/data/namefiles/dwarves.nam
similarity index 100%
rename from plugins/util/namefiles/dwarves.nam
rename to plugins/data/namefiles/dwarves.nam
diff --git a/plugins/util/namefiles/elves_f.nam b/plugins/data/namefiles/elves_f.nam
similarity index 100%
rename from plugins/util/namefiles/elves_f.nam
rename to plugins/data/namefiles/elves_f.nam
diff --git a/plugins/util/namefiles/elves_m.nam b/plugins/data/namefiles/elves_m.nam
similarity index 100%
rename from plugins/util/namefiles/elves_m.nam
rename to plugins/data/namefiles/elves_m.nam
diff --git a/plugins/util/namefiles/fantasy.nam b/plugins/data/namefiles/fantasy.nam
similarity index 100%
rename from plugins/util/namefiles/fantasy.nam
rename to plugins/data/namefiles/fantasy.nam
diff --git a/plugins/util/namefiles/felana.nam b/plugins/data/namefiles/felana.nam
similarity index 100%
rename from plugins/util/namefiles/felana.nam
rename to plugins/data/namefiles/felana.nam
diff --git a/plugins/util/namefiles/gargun.nam b/plugins/data/namefiles/gargun.nam
similarity index 100%
rename from plugins/util/namefiles/gargun.nam
rename to plugins/data/namefiles/gargun.nam
diff --git a/plugins/util/namefiles/general.nam b/plugins/data/namefiles/general.nam
similarity index 100%
rename from plugins/util/namefiles/general.nam
rename to plugins/data/namefiles/general.nam
diff --git a/plugins/util/namefiles/harn_f.nam b/plugins/data/namefiles/harn_f.nam
similarity index 100%
rename from plugins/util/namefiles/harn_f.nam
rename to plugins/data/namefiles/harn_f.nam
diff --git a/plugins/util/namefiles/harn_m.nam b/plugins/data/namefiles/harn_m.nam
similarity index 100%
rename from plugins/util/namefiles/harn_m.nam
rename to plugins/data/namefiles/harn_m.nam
diff --git a/plugins/util/namefiles/hobbits.nam b/plugins/data/namefiles/hobbits.nam
similarity index 100%
rename from plugins/util/namefiles/hobbits.nam
rename to plugins/data/namefiles/hobbits.nam
diff --git a/plugins/util/namefiles/human_f.nam b/plugins/data/namefiles/human_f.nam
similarity index 100%
rename from plugins/util/namefiles/human_f.nam
rename to plugins/data/namefiles/human_f.nam
diff --git a/plugins/util/namefiles/human_m.nam b/plugins/data/namefiles/human_m.nam
similarity index 100%
rename from plugins/util/namefiles/human_m.nam
rename to plugins/data/namefiles/human_m.nam
diff --git a/plugins/util/namefiles/inns.nam b/plugins/data/namefiles/inns.nam
similarity index 100%
rename from plugins/util/namefiles/inns.nam
rename to plugins/data/namefiles/inns.nam
diff --git a/plugins/util/namefiles/items.nam b/plugins/data/namefiles/items.nam
similarity index 100%
rename from plugins/util/namefiles/items.nam
rename to plugins/data/namefiles/items.nam
diff --git a/plugins/util/namefiles/narn.nam b/plugins/data/namefiles/narn.nam
similarity index 100%
rename from plugins/util/namefiles/narn.nam
rename to plugins/data/namefiles/narn.nam
diff --git a/plugins/util/namefiles/sindarin_f.nam b/plugins/data/namefiles/sindarin_f.nam
similarity index 100%
rename from plugins/util/namefiles/sindarin_f.nam
rename to plugins/data/namefiles/sindarin_f.nam
diff --git a/plugins/util/namefiles/sindarin_m.nam b/plugins/data/namefiles/sindarin_m.nam
similarity index 100%
rename from plugins/util/namefiles/sindarin_m.nam
rename to plugins/data/namefiles/sindarin_m.nam
diff --git a/plugins/util/namefiles/towns.nam b/plugins/data/namefiles/towns.nam
similarity index 100%
rename from plugins/util/namefiles/towns.nam
rename to plugins/data/namefiles/towns.nam
diff --git a/plugins/util/namefiles/wc_cats.nam b/plugins/data/namefiles/wc_cats.nam
similarity index 100%
rename from plugins/util/namefiles/wc_cats.nam
rename to plugins/data/namefiles/wc_cats.nam
diff --git a/plugins/util/namefiles/wc_tribes.nam b/plugins/data/namefiles/wc_tribes.nam
similarity index 100%
rename from plugins/util/namefiles/wc_tribes.nam
rename to plugins/data/namefiles/wc_tribes.nam
diff --git a/plugins/util/molecular.py b/plugins/util/molecular.py
index 3de9c00..a1f5ef2 100755
--- a/plugins/util/molecular.py
+++ b/plugins/util/molecular.py
@@ -76,7 +76,7 @@ __version__ = "1.0"
 
 import string, re, sys, random, os
 
-NAMEDIR = os.path.dirname(__file__) + "/namefiles"
+NAMEDIR = os.path.dirname(__file__) + "/../data/namefiles"
 NAMESECTIONS = [ "inf", "first", "mid", "final", "notes", "end" ]
 
 class NameFile: