diff --git a/hilbish.go b/hilbish.go
index fa70a69..2f9b135 100644
--- a/hilbish.go
+++ b/hilbish.go
@@ -33,8 +33,11 @@ func HilbishLoader(L *lua.LState) int {
 	L.SetField(mod, "user", lua.LString(username))
 	L.SetField(mod, "host", lua.LString(host))
 	L.SetField(mod, "home", lua.LString(homedir))
-	L.SetField(mod, "xdgConfig", lua.LString(confDir))
-	L.SetField(mod, "xdgData", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
+
+	xdg := L.NewTable()
+	L.SetField(xdg, "config", lua.LString(confDir))
+	L.SetField(xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
+	L.SetField(mod, "xdg", xdg)
 
 	L.Push(mod)
 
diff --git a/vars_linux.go b/vars_linux.go
index 34f5527..cfcabc9 100644
--- a/vars_linux.go
+++ b/vars_linux.go
@@ -7,12 +7,12 @@ var (
 	requirePaths = `';./libs/?/?.lua;./libs/?/init.lua;./?/init.lua;./?/?.lua'
 	.. ';/usr/share/hilbish/libs/?/init.lua;'
 	.. ';/usr/share/hilbish/libs/?/?.lua;'
-	.. hilbish.xdgData .. '/hilbish/libs/?/init.lua;'
-	.. hilbish.xdgData	.. '/hilbish/libs/?/?.lua;'
-	.. hilbish.xdgData	.. '/hilbish/libs/?.lua'
-	.. hilbish.xdgConfig	.. '/?/init.lua'
-	.. hilbish.xdgConfig	.. '/?/?.lua'
-	.. hilbish.xdgConfig	.. '/?.lua'`
+	.. hilbish.xdg.data .. '/hilbish/libs/?/init.lua;'
+	.. hilbish.xdg.data	.. '/hilbish/libs/?/?.lua;'
+	.. hilbish.xdg.data	.. '/hilbish/libs/?.lua'
+	.. hilbish.xdg.config	.. '/?/init.lua'
+	.. hilbish.xdg.config	.. '/?/?.lua'
+	.. hilbish.xdg.config	.. '/?.lua'`
 	preloadPath = "/usr/share/hilbish/preload.lua"
 	sampleConfPath = "/usr/share/hilbish/.hilbishrc.lua" // Path to default/sample config
 )