diff --git a/aux-addon.lua b/aux-addon.lua
index a79b841..d319c9f 100644
--- a/aux-addon.lua
+++ b/aux-addon.lua
@@ -1,20 +1,26 @@
+--aux_account_settings = {} -- TODO
+--aux_character_settings = {}
+
+module()
+
+public.version = '5.0.0'
+
 do
-	local modules = {core={create_module()}}
-	aux = setmetatable({}, {
+	local modules = {core={env=M, interface=I}}
+	_G.aux = setmetatable({}, {
 		__metatable = false,
-		__index = function(_, key) return modules[key][2] end,
+		__index = function(_, key) return modules[key].interface end,
 		__newindex = function() end,
 		__call = function(_, name)
-			modules[name] = modules[name] or {create_module(aux.core)}
-			setfenv(2, modules[name][1]())
+			if not modules[name] then
+				module(aux.core)
+				modules[name] = {env=M, interface=I}
+			end
+			setfenv(2, modules[name].env)
 		end,
 	})
 end
 
-aux 'core'
-
-public.version = '5.0.0'
-
 do
 	local bids_loaded
 	public.bids_loaded
diff --git a/aux-addon.toc b/aux-addon.toc
index ebb832b..1b00cae 100644
--- a/aux-addon.toc
+++ b/aux-addon.toc
@@ -4,7 +4,8 @@
 ## SavedVariablesPerCharacter: aux_auto_buy_filter, aux_tooltip_value, aux_tooltip_daily, aux_tooltip_vendor_buy, aux_tooltip_vendor_sell, aux_tooltip_disenchant_value, aux_tooltip_disenchant_distribution, aux_tooltip_disenchant_source
 ## SavedVariables: aux_datasets, aux_items, aux_item_ids, aux_auctionable_items, aux_merchant_buy, aux_merchant_sell, aux_characters, aux_recent_searches, aux_favorite_searches, aux_ignore_owner, aux_price_per_unit
 
-module.lua
+libs\module.lua
+
 aux-addon.lua
 util\core.lua
 control.lua
diff --git a/module.lua b/libs/module.lua
similarity index 100%
rename from module.lua
rename to libs/module.lua