diff --git a/Lua/addrs/M EU10.lua b/Lua/addrs/M/EU10.lua
similarity index 100%
rename from Lua/addrs/M EU10.lua
rename to Lua/addrs/M/EU10.lua
diff --git a/Lua/addrs/M EU11.lua b/Lua/addrs/M/EU11.lua
similarity index 100%
rename from Lua/addrs/M EU11.lua
rename to Lua/addrs/M/EU11.lua
diff --git a/Lua/addrs/M EUDB.lua b/Lua/addrs/M/EUDB.lua
similarity index 100%
rename from Lua/addrs/M EUDB.lua
rename to Lua/addrs/M/EUDB.lua
diff --git a/Lua/addrs/M EUGC.lua b/Lua/addrs/M/EUGC.lua
similarity index 100%
rename from Lua/addrs/M EUGC.lua
rename to Lua/addrs/M/EUGC.lua
diff --git a/Lua/addrs/M JP10.lua b/Lua/addrs/M/JP10.lua
similarity index 100%
rename from Lua/addrs/M JP10.lua
rename to Lua/addrs/M/JP10.lua
diff --git a/Lua/addrs/M JP11.lua b/Lua/addrs/M/JP11.lua
similarity index 100%
rename from Lua/addrs/M JP11.lua
rename to Lua/addrs/M/JP11.lua
diff --git a/Lua/addrs/M JPGC.lua b/Lua/addrs/M/JPGC.lua
similarity index 100%
rename from Lua/addrs/M JPGC.lua
rename to Lua/addrs/M/JPGC.lua
diff --git a/Lua/addrs/M US10.lua b/Lua/addrs/M/US10.lua
similarity index 100%
rename from Lua/addrs/M US10.lua
rename to Lua/addrs/M/US10.lua
diff --git a/Lua/addrs/M USDE.lua b/Lua/addrs/M/USDE.lua
similarity index 100%
rename from Lua/addrs/M USDE.lua
rename to Lua/addrs/M/USDE.lua
diff --git a/Lua/addrs/M USGC.lua b/Lua/addrs/M/USGC.lua
similarity index 100%
rename from Lua/addrs/M USGC.lua
rename to Lua/addrs/M/USGC.lua
diff --git a/Lua/addrs/M common.lua b/Lua/addrs/M/common.lua
similarity index 100%
rename from Lua/addrs/M common.lua
rename to Lua/addrs/M/common.lua
diff --git a/Lua/addrs/O EU10.lua b/Lua/addrs/O/EU10.lua
similarity index 100%
rename from Lua/addrs/O EU10.lua
rename to Lua/addrs/O/EU10.lua
diff --git a/Lua/addrs/O EU11.lua b/Lua/addrs/O/EU11.lua
similarity index 100%
rename from Lua/addrs/O EU11.lua
rename to Lua/addrs/O/EU11.lua
diff --git a/Lua/addrs/O EUDB MQ.lua b/Lua/addrs/O/EUDB MQ.lua
similarity index 100%
rename from Lua/addrs/O EUDB MQ.lua
rename to Lua/addrs/O/EUDB MQ.lua
diff --git a/Lua/addrs/O EUGC MQ.lua b/Lua/addrs/O/EUGC MQ.lua
similarity index 100%
rename from Lua/addrs/O EUGC MQ.lua
rename to Lua/addrs/O/EUGC MQ.lua
diff --git a/Lua/addrs/O EUGC.lua b/Lua/addrs/O/EUGC.lua
similarity index 100%
rename from Lua/addrs/O EUGC.lua
rename to Lua/addrs/O/EUGC.lua
diff --git a/Lua/addrs/O JP10.lua b/Lua/addrs/O/JP10.lua
similarity index 100%
rename from Lua/addrs/O JP10.lua
rename to Lua/addrs/O/JP10.lua
diff --git a/Lua/addrs/O JP11.lua b/Lua/addrs/O/JP11.lua
similarity index 100%
rename from Lua/addrs/O JP11.lua
rename to Lua/addrs/O/JP11.lua
diff --git a/Lua/addrs/O JP12.lua b/Lua/addrs/O/JP12.lua
similarity index 100%
rename from Lua/addrs/O JP12.lua
rename to Lua/addrs/O/JP12.lua
diff --git a/Lua/addrs/O JPGC MQ.lua b/Lua/addrs/O/JPGC MQ.lua
similarity index 100%
rename from Lua/addrs/O JPGC MQ.lua
rename to Lua/addrs/O/JPGC MQ.lua
diff --git a/Lua/addrs/O JPGC.lua b/Lua/addrs/O/JPGC.lua
similarity index 100%
rename from Lua/addrs/O JPGC.lua
rename to Lua/addrs/O/JPGC.lua
diff --git a/Lua/addrs/O US10.lua b/Lua/addrs/O/US10.lua
similarity index 100%
rename from Lua/addrs/O US10.lua
rename to Lua/addrs/O/US10.lua
diff --git a/Lua/addrs/O US11.lua b/Lua/addrs/O/US11.lua
similarity index 100%
rename from Lua/addrs/O US11.lua
rename to Lua/addrs/O/US11.lua
diff --git a/Lua/addrs/O US12.lua b/Lua/addrs/O/US12.lua
similarity index 100%
rename from Lua/addrs/O US12.lua
rename to Lua/addrs/O/US12.lua
diff --git a/Lua/addrs/O USGC MQ.lua b/Lua/addrs/O/USGC MQ.lua
similarity index 100%
rename from Lua/addrs/O USGC MQ.lua
rename to Lua/addrs/O/USGC MQ.lua
diff --git a/Lua/addrs/O USGC.lua b/Lua/addrs/O/USGC.lua
similarity index 100%
rename from Lua/addrs/O USGC.lua
rename to Lua/addrs/O/USGC.lua
diff --git a/Lua/addrs/O common.lua b/Lua/addrs/O/common.lua
similarity index 100%
rename from Lua/addrs/O common.lua
rename to Lua/addrs/O/common.lua
diff --git a/Lua/addrs/addrs.lua b/Lua/addrs/addrs.lua
index 6e3429c..ba41f97 100755
--- a/Lua/addrs/addrs.lua
+++ b/Lua/addrs/addrs.lua
@@ -29,10 +29,13 @@ return function(hash)
     end
     function AA(a, s) return A(b.actor + a, s) end
 
-    local addrs = require("addrs."..rv)
+    local subdir = version:sub(1, 1)
+    local rvs = rv:sub(3)
+
+    local addrs = require("addrs."..subdir.."."..rvs)
     addrs.version = version
     addrs.oot = v == "O "
     addrs.mm  = v == "M "
-    local common = require("addrs."..v.."common")
+    local common = require("addrs."..subdir..".common")
     return setmetatable(addrs, {__index=common})
 end