diff --git a/Lua/actor lister.lua b/Lua/actor lister.lua
index e174c5a..e486800 100755
--- a/Lua/actor lister.lua	
+++ b/Lua/actor lister.lua	
@@ -10,8 +10,8 @@ local validate = true
 local actor_t = Actor(0)
 
 local suffix = oot and " oot" or ""
-local actor_names  = require( "actor names"..suffix)
-local damage_names = require("damage names"..suffix)
+local actor_names  = require("data.actor names"..suffix)
+local damage_names = require("data.damage names"..suffix)
 
 function sort_by_key(t)
     local sorted = {}
diff --git a/Lua/actor names oot.lua b/Lua/data/actor names oot.lua
similarity index 100%
rename from Lua/actor names oot.lua
rename to Lua/data/actor names oot.lua
diff --git a/Lua/actor names.lua b/Lua/data/actor names.lua
similarity index 100%
rename from Lua/actor names.lua
rename to Lua/data/actor names.lua
diff --git a/Lua/damage names oot.lua b/Lua/data/damage names oot.lua
similarity index 100%
rename from Lua/damage names oot.lua
rename to Lua/data/damage names oot.lua
diff --git a/Lua/damage names.lua b/Lua/data/damage names.lua
similarity index 100%
rename from Lua/damage names.lua
rename to Lua/data/damage names.lua
diff --git a/Lua/item values early.lua b/Lua/data/item values early.lua
similarity index 100%
rename from Lua/item values early.lua
rename to Lua/data/item values early.lua
diff --git a/Lua/item values oot.lua b/Lua/data/item values oot.lua
similarity index 100%
rename from Lua/item values oot.lua
rename to Lua/data/item values oot.lua
diff --git a/Lua/item values.lua b/Lua/data/item values.lua
similarity index 100%
rename from Lua/item values.lua
rename to Lua/data/item values.lua
diff --git a/Lua/object names.lua b/Lua/data/object names.lua
similarity index 100%
rename from Lua/object names.lua
rename to Lua/data/object names.lua
diff --git a/Lua/oneshot.lua b/Lua/oneshot.lua
index fa72ce4..8cef831 100755
--- a/Lua/oneshot.lua
+++ b/Lua/oneshot.lua
@@ -1,14 +1,13 @@
 -- gimme gimme gimme
 local a = require "addrs.init"
-require "item values"
 
 local iv
 if version == "M JP10" or version == "M JP11" then
-    iv = require "item values early"
+    iv = require "data.item values early"
 elseif oot then
-    iv = require "item values oot"
+    iv = require "data.item values oot"
 else
-    iv = require "item values"
+    iv = require "data.item values"
 end
 
 local inv = a.inventory
diff --git a/Lua/room debug.lua b/Lua/room debug.lua
index 175196f..886e286 100755
--- a/Lua/room debug.lua	
+++ b/Lua/room debug.lua	
@@ -127,7 +127,7 @@ function dump_room(start, addr)
 
     if actors then
         print("# actors")
-        local actor_names = require "actor names"
+        local actor_names = require "data.actor names"
         local buf = ""
         for i = 0, actor_n - 1 do
             local id = R2(actors + 16*i)
@@ -140,7 +140,7 @@ function dump_room(start, addr)
 
     if objects then
         print("# objects")
-        local object_names = require "object names"
+        local object_names = require "data.object names"
         local buf = ""
         for i = 0, object_n - 1 do
             local id = R2(objects + 2*i)