diff --git a/aqua/util/Animation.lua b/Animation.lua
similarity index 91%
rename from aqua/util/Animation.lua
rename to Animation.lua
index ca7b93b..c02df3b 100644
--- a/aqua/util/Animation.lua
+++ b/Animation.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Animation = Class:new()
 
diff --git a/aqua/util/Class.lua b/Class.lua
similarity index 100%
rename from aqua/util/Class.lua
rename to Class.lua
diff --git a/aqua/util/Log.lua b/Log.lua
similarity index 93%
rename from aqua/util/Log.lua
rename to Log.lua
index 93e39a5..73c89fb 100644
--- a/aqua/util/Log.lua
+++ b/Log.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Log = Class:new()
 
diff --git a/aqua/util/Observable.lua b/Observable.lua
similarity index 92%
rename from aqua/util/Observable.lua
rename to Observable.lua
index 365c8f1..6fb45ba 100644
--- a/aqua/util/Observable.lua
+++ b/Observable.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Observable = Class:new()
 
diff --git a/aqua/util/Profiler.lua b/Profiler.lua
similarity index 95%
rename from aqua/util/Profiler.lua
rename to Profiler.lua
index dd87623..e4e7c16 100644
--- a/aqua/util/Profiler.lua
+++ b/Profiler.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Profiler = Class:new()
 
diff --git a/aqua/util/Queue.lua b/Queue.lua
similarity index 100%
rename from aqua/util/Queue.lua
rename to Queue.lua
diff --git a/aqua/util/RingBuffer.lua b/RingBuffer.lua
similarity index 91%
rename from aqua/util/RingBuffer.lua
rename to RingBuffer.lua
index dc60062..0775708 100644
--- a/aqua/util/RingBuffer.lua
+++ b/RingBuffer.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local RingBuffer = Class:new()
 
diff --git a/aqua/util/TimedCache.lua b/TimedCache.lua
similarity index 94%
rename from aqua/util/TimedCache.lua
rename to TimedCache.lua
index e66299e..aefd387 100644
--- a/aqua/util/TimedCache.lua
+++ b/TimedCache.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local TimedCache = Class:new()
 
diff --git a/aqua/util/Timer.lua b/Timer.lua
similarity index 98%
rename from aqua/util/Timer.lua
rename to Timer.lua
index d2cfb0c..e7a694a 100644
--- a/aqua/util/Timer.lua
+++ b/Timer.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Timer = Class:new()
 
diff --git a/aqua/graphics/baseline_print.lua b/aqua/graphics/baseline_print.lua
deleted file mode 100644
index 2a3d644..0000000
--- a/aqua/graphics/baseline_print.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-return function(text, x, baseline, limit, scale, ax)
-	local font = love.graphics.getFont()
-
-	local y = baseline - font:getBaseline() * scale
-
-	local status, err = pcall(
-		love.graphics.printf,
-		text,
-		x,
-		y,
-		limit,
-		ax,
-		0,
-		scale,
-		scale
-	)
-	if not status then
-		love.graphics.printf(
-			err,
-			x,
-			y,
-			limit,
-			ax,
-			0,
-			scale,
-			scale
-		)
-	end
-end
diff --git a/aqua/graphics/canvas.lua b/aqua/graphics/canvas.lua
deleted file mode 100644
index 049b496..0000000
--- a/aqua/graphics/canvas.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local canvases = {}
-
-local function newCanvas(w, h)
-	local _, _, flags = love.window.getMode()
-	return love.graphics.newCanvas(w, h, {msaa = flags.msaa})
-end
-
-return function(key)
-	local w, h = love.graphics.getDimensions()
-	if not canvases[key] then
-		canvases[key] = newCanvas(w, h)
-		return canvases[key]
-	end
-	local canvas = canvases[key]
-	if canvas:getWidth() ~= w or canvas:getHeight() ~= h then
-		canvas:release()
-		canvases[key] = newCanvas(w, h)
-	end
-	return canvases[key]
-end
diff --git a/aqua/graphics/frame_draw.lua b/aqua/graphics/frame_draw.lua
deleted file mode 100644
index 3627a4f..0000000
--- a/aqua/graphics/frame_draw.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-return function(drawable, x, y, w, h, locate)
-    local dw = drawable:getWidth()
-    local dh = drawable:getHeight()
-
-	local scale = 1
-	local s1 = w / h <= dw / dh
-	local s2 = w / h >= dw / dh
-
-	if locate == "out" and s1 or locate == "in" and s2 then
-		scale = h / dh
-	elseif locate == "out" and s2 or locate == "in" and s1 then
-		scale = w / dw
-	end
-
-    return love.graphics.draw(
-		drawable,
-		x + (w - dw * scale) / 2,
-		y + (h - dh * scale) / 2,
-		0,
-		scale,
-		scale
-	)
-end
diff --git a/aqua/graphics/frame_print.lua b/aqua/graphics/frame_print.lua
deleted file mode 100644
index 1994dea..0000000
--- a/aqua/graphics/frame_print.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-return function(text, x, y, w, h, scale, ax, ay)
-	local font = love.graphics.getFont()
-
-	local scaledLimit = w / scale
-
-	local width, wrappedText = 0, ""
-	local status, err1, err2 = pcall(font.getWrap, font, text, scaledLimit)
-	if status then
-		width, wrappedText = err1, err2
-	else
-		width, wrappedText = font:getWrap(err1, scaledLimit)
-	end
-
-	local lineCount = #wrappedText
-
-	if ay == "center" then
-		y = y + (h - font:getHeight() * lineCount * scale) / 2
-	elseif ay == "bottom" then
-		y = y + h - font:getHeight() * lineCount * scale
-	end
-
-	local status, err = pcall(
-		love.graphics.printf,
-		text,
-		x,
-		y,
-		scaledLimit,
-		ax,
-		0,
-		scale,
-		scale
-	)
-	if not status then
-		love.graphics.printf(
-			err,
-			x,
-			y,
-			scaledLimit,
-			ax,
-			0,
-			scale,
-			scale
-		)
-	end
-end
diff --git a/aqua/graphics/newGradient.lua b/aqua/graphics/newGradient.lua
deleted file mode 100644
index 459d1c0..0000000
--- a/aqua/graphics/newGradient.lua
+++ /dev/null
@@ -1,35 +0,0 @@
--- https://love2d.org/wiki/Gradients
-return function(dir, ...)
-    local isHorizontal = true
-    if dir == "vertical" then
-        isHorizontal = false
-    elseif dir ~= "horizontal" then
-        error("bad argument #1 to 'gradient' (invalid value)", 2)
-    end
-
-    local colorLen = select("#", ...)
-    if colorLen < 2 then
-        error("color list is less than two", 2)
-    end
-
-    local meshData = {}
-    if isHorizontal then
-        for i = 1, colorLen do
-            local color = select(i, ...)
-            local x = (i - 1) / (colorLen - 1)
-
-            meshData[#meshData + 1] = {x, 1, x, 1, unpack(color)}
-            meshData[#meshData + 1] = {x, 0, x, 0, unpack(color)}
-        end
-    else
-        for i = 1, colorLen do
-            local color = select(i, ...)
-            local y = (i - 1) / (colorLen - 1)
-
-            meshData[#meshData + 1] = {1, y, 1, y, unpack(color)}
-            meshData[#meshData + 1] = {0, y, 0, y, unpack(color)}
-        end
-    end
-
-    return love.graphics.newMesh(meshData, "strip", "static")
-end
diff --git a/aqua/graphics/newPixel.lua b/aqua/graphics/newPixel.lua
deleted file mode 100644
index 0fcae3c..0000000
--- a/aqua/graphics/newPixel.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return function(r, g, b, a)
-	local imageData = love.image.newImageData(1, 1)
-	imageData:setPixel(0, 0, r or 1, g or 1, b or 1, a or 1)
-	return love.graphics.newImage(imageData)
-end
diff --git a/aqua/graphics/transform.lua b/aqua/graphics/transform.lua
deleted file mode 100644
index 1c790cd..0000000
--- a/aqua/graphics/transform.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-local transform
-
-local args = {}
-return function(t)
-	for i = 1, 9 do
-		local value = t[i]
-		if type(value) == "table" then
-			local w, h = love.graphics.getDimensions()
-			args[i] = value[1] * w + value[2] * h + (value[3] or 0)
-		elseif type(value) == "number" then
-			args[i] = value
-		elseif type(value) == "function" then
-			args[i] = value()
-		else
-			error("Invalid value: " .. i)
-		end
-	end
-
-	transform = transform or love.math.newTransform()
-	return transform:setTransformation(unpack(args))
-end
diff --git a/aqua/table_util.lua b/aqua/table_util.lua
deleted file mode 100644
index b3cd94f..0000000
--- a/aqua/table_util.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-local table_util = {}
-
-function table_util.leftequal(a, b)
-	for key in pairs(a) do
-		if a[key] ~= b[key] then
-			return
-		end
-	end
-
-	return true
-end
-
-function table_util.equal(a, b)
-	return table.leftequal(a, b) and table.leftequal(b, a)
-end
-
-function table_util.deepcopy(t)
-	if type(t) ~= "table" then
-		return t
-	end
-	local out = {}
-	for k, v in pairs(t) do
-		if type(v) == "table" then
-			out[k] = table_util.deepcopy(v)
-		else
-			out[k] = v
-		end
-	end
-	return out
-end
-
-return table_util
diff --git a/aqua/util/array_update.lua b/aqua/util/array_update.lua
deleted file mode 100644
index 21fba5a..0000000
--- a/aqua/util/array_update.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-return function(new, old, new_f, old_f)
-	local _new = {}
-	for _, v in ipairs(new) do
-		if new_f then v = new_f(v) end
-		_new[v] = true
-	end
-
-	local _old = {}
-	for _, v in ipairs(old) do
-		if old_f then v = old_f(v) end
-		_old[v] = true
-	end
-
-	new = {}
-	old = {}
-	local all = {}
-	for v in pairs(_new) do
-		if not _old[v] then
-			table.insert(new, v)
-		end
-		table.insert(all, v)
-	end
-	for v in pairs(_old) do
-		if not _new[v] then
-			table.insert(old, v)
-		end
-	end
-
-	return new, old, all
-end
diff --git a/aqua/util/inside.lua b/aqua/util/inside.lua
deleted file mode 100644
index e52a8fd..0000000
--- a/aqua/util/inside.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-local function inside(t, key)
-	local subvalue = t
-	if type(key) == "table" then
-		for _, subkey in ipairs(key) do
-			if type(subkey) == "table" then
-				local k = subkey[1]
-				local f = subkey[2]
-				local v = inside(t, k)
-				if v and f(t) then
-					return v
-				end
-			elseif type(subkey) == "string" then
-				local v = inside(t, subkey)
-				if v then
-					return v
-				end
-			end
-		end
-		return
-	elseif type(key) == "string" then
-		for subkey in key:gmatch("[^.]+") do
-			if type(subvalue) ~= "table" then
-				return
-			end
-			subvalue = subvalue[subkey]
-		end
-		return subvalue
-	end
-end
-
-return inside
diff --git a/aqua/util/outside.lua b/aqua/util/outside.lua
deleted file mode 100644
index 6b8a8ef..0000000
--- a/aqua/util/outside.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local function outside(t, key, value)
-	if type(key) ~= "string" or type(t) ~= "table" then
-		return
-	end
-	local subvalue = t
-	local prevValue
-	local lastSubkey
-	for subkey in key:gmatch("[^.]+") do
-		if type(subvalue) ~= "table" then
-			prevValue[lastSubkey] = {}
-			subvalue = prevValue[lastSubkey]
-		end
-		prevValue = subvalue
-		subvalue = subvalue[subkey]
-		lastSubkey = subkey
-	end
-	prevValue[lastSubkey] = value
-end
-
-return outside
diff --git a/aqua/asynckey.lua b/asynckey.lua
similarity index 100%
rename from aqua/asynckey.lua
rename to asynckey.lua
diff --git a/aqua/audio/BassSource.lua b/audio/BassSource.lua
similarity index 93%
rename from aqua/audio/BassSource.lua
rename to audio/BassSource.lua
index a7ed973..8ae5b88 100644
--- a/aqua/audio/BassSource.lua
+++ b/audio/BassSource.lua
@@ -1,6 +1,6 @@
-local bass = require("aqua.audio.bass")
-local bass_assert = require("aqua.audio.bass_assert")
-local Source = require("aqua.audio.Source")
+local bass = require("audio.bass")
+local bass_assert = require("audio.bass_assert")
+local Source = require("audio.Source")
 
 local BassSource = Source:new()
 
diff --git a/aqua/audio/Container.lua b/audio/Container.lua
similarity index 97%
rename from aqua/audio/Container.lua
rename to audio/Container.lua
index 221d83a..194b99d 100644
--- a/aqua/audio/Container.lua
+++ b/audio/Container.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Container = Class:new()
 
diff --git a/aqua/audio/Sample.lua b/audio/Sample.lua
similarity index 60%
rename from aqua/audio/Sample.lua
rename to audio/Sample.lua
index 0b5a7c5..ea66d79 100644
--- a/aqua/audio/Sample.lua
+++ b/audio/Sample.lua
@@ -1,6 +1,6 @@
-local bass = require("aqua.audio.bass")
-local bass_assert = require("aqua.audio.bass_assert")
-local BassSource = require("aqua.audio.BassSource")
+local bass = require("audio.bass")
+local bass_assert = require("audio.bass_assert")
+local BassSource = require("audio.BassSource")
 
 local Sample = BassSource:new()
 
diff --git a/aqua/audio/Source.lua b/audio/Source.lua
similarity index 93%
rename from aqua/audio/Source.lua
rename to audio/Source.lua
index cb291c7..7f8474e 100644
--- a/aqua/audio/Source.lua
+++ b/audio/Source.lua
@@ -1,4 +1,4 @@
-local Class = require("aqua.util.Class")
+local Class = require("Class")
 
 local Source = Class:new()
 
diff --git a/aqua/audio/StreamMemoryTempo.lua b/audio/StreamMemoryTempo.lua
similarity index 81%
rename from aqua/audio/StreamMemoryTempo.lua
rename to audio/StreamMemoryTempo.lua
index fad769a..0ca24cb 100644
--- a/aqua/audio/StreamMemoryTempo.lua
+++ b/audio/StreamMemoryTempo.lua
@@ -1,7 +1,7 @@
-local bass = require("aqua.audio.bass")
-local bass_fx = require("aqua.audio.bass_fx")
-local bass_assert = require("aqua.audio.bass_assert")
-local BassSource = require("aqua.audio.BassSource")
+local bass = require("audio.bass")
+local bass_fx = require("audio.bass_fx")
+local bass_assert = require("audio.bass_assert")
+local BassSource = require("audio.BassSource")
 
 local StreamMemoryTempo = BassSource:new()
 
diff --git a/aqua/audio/bass.lua b/audio/bass.lua
similarity index 100%
rename from aqua/audio/bass.lua
rename to audio/bass.lua
diff --git a/aqua/audio/bass_amplify.lua b/audio/bass_amplify.lua
similarity index 84%
rename from aqua/audio/bass_amplify.lua
rename to audio/bass_amplify.lua
index 534a213..819fbf2 100644
--- a/aqua/audio/bass_amplify.lua
+++ b/audio/bass_amplify.lua
@@ -1,6 +1,6 @@
 local ffi = require("ffi")
-local bass = require("aqua.audio.bass")
-local bass_assert = require("aqua.audio.bass_assert")
+local bass = require("audio.bass")
+local bass_assert = require("audio.bass_assert")
 
 local info = ffi.new("BASS_SAMPLE")
 return function(sample, gain)
diff --git a/aqua/audio/bass_assert.lua b/audio/bass_assert.lua
similarity index 96%
rename from aqua/audio/bass_assert.lua
rename to audio/bass_assert.lua
index f56a7e6..04d3f54 100644
--- a/aqua/audio/bass_assert.lua
+++ b/audio/bass_assert.lua
@@ -1,4 +1,4 @@
-local bass = require("aqua.audio.bass")
+local bass = require("audio.bass")
 
 local errors = {
 	[0] = "BASS_OK",
diff --git a/aqua/audio/bass_fx.lua b/audio/bass_fx.lua
similarity index 100%
rename from aqua/audio/bass_fx.lua
rename to audio/bass_fx.lua
diff --git a/aqua/audio/init.lua b/audio/init.lua
similarity index 83%
rename from aqua/audio/init.lua
rename to audio/init.lua
index 88bc505..8aa7d45 100644
--- a/aqua/audio/init.lua
+++ b/audio/init.lua
@@ -1,9 +1,9 @@
-local bass = require("aqua.audio.bass")
-local bass_assert = require("aqua.audio.bass_assert")
-local bass_amplify = require("aqua.audio.bass_amplify")
+local bass = require("audio.bass")
+local bass_assert = require("audio.bass_assert")
+local bass_amplify = require("audio.bass_amplify")
 local ffi = require("ffi")
-local Sample = require("aqua.audio.Sample")
-local StreamMemoryTempo = require("aqua.audio.StreamMemoryTempo")
+local Sample = require("audio.Sample")
+local StreamMemoryTempo = require("audio.StreamMemoryTempo")
 
 local audio = {}
 
diff --git a/aqua/util/autoload.lua b/autoload.lua
similarity index 100%
rename from aqua/util/autoload.lua
rename to autoload.lua
diff --git a/aqua/delay.lua b/delay.lua
similarity index 100%
rename from aqua/delay.lua
rename to delay.lua
diff --git a/gfx_util.lua b/gfx_util.lua
new file mode 100644
index 0000000..085d6c9
--- /dev/null
+++ b/gfx_util.lua
@@ -0,0 +1,170 @@
+local gfx_util = {}
+
+function gfx_util.printBaseline(text, x, baseline, limit, scale, ax)
+	local font = love.graphics.getFont()
+
+	local y = baseline - font:getBaseline() * scale
+
+	local status, err = pcall(love.graphics.printf, text, x, y, limit, ax, 0, scale)
+	if not status then
+		love.graphics.printf(err, x, y, limit, ax, 0, scale)
+	end
+end
+
+function gfx_util.drawFrame(drawable, x, y, w, h, locate)
+    local dw = drawable:getWidth()
+    local dh = drawable:getHeight()
+
+	local s = 1
+	local s1 = w / h <= dw / dh
+	local s2 = w / h >= dw / dh
+
+	if locate == "out" and s1 or locate == "in" and s2 then
+		s = h / dh
+	elseif locate == "out" and s2 or locate == "in" and s1 then
+		s = w / dw
+	end
+
+    return love.graphics.draw(drawable, x + (w - dw * s) / 2, y + (h - dh * s) / 2, 0, s)
+end
+
+function gfx_util.printFrame(text, x, y, w, h, ax, ay)
+	local font = love.graphics.getFont()
+	local _, wrappedText = font:getWrap(text, w)
+	local height = font:getHeight() * font:getLineHeight() * #wrappedText
+
+	if ay == "center" then
+		y = y + (h - height) / 2
+	elseif ay == "bottom" then
+		y = y + h - height
+	end
+
+	love.graphics.printf(text, x, y, w, ax, 0)
+end
+
+-- https://love2d.org/wiki/Gradients
+function gfx_util.newGradient(dir, ...)
+    local isHorizontal = true
+    if dir == "vertical" then
+        isHorizontal = false
+    elseif dir ~= "horizontal" then
+        error("bad argument #1 to 'gradient' (invalid value)", 2)
+    end
+
+    local colorLen = select("#", ...)
+    if colorLen < 2 then
+        error("color list is less than two", 2)
+    end
+
+    local meshData = {}
+    if isHorizontal then
+        for i = 1, colorLen do
+            local color = select(i, ...)
+            local x = (i - 1) / (colorLen - 1)
+
+            meshData[#meshData + 1] = {x, 1, x, 1, unpack(color)}
+            meshData[#meshData + 1] = {x, 0, x, 0, unpack(color)}
+        end
+    else
+        for i = 1, colorLen do
+            local color = select(i, ...)
+            local y = (i - 1) / (colorLen - 1)
+
+            meshData[#meshData + 1] = {1, y, 1, y, unpack(color)}
+            meshData[#meshData + 1] = {0, y, 0, y, unpack(color)}
+        end
+    end
+
+    return love.graphics.newMesh(meshData, "strip", "static")
+end
+
+function gfx_util.newPixel(r, g, b, a)
+	local imageData = love.image.newImageData(1, 1)
+	imageData:setPixel(0, 0, r or 1, g or 1, b or 1, a or 1)
+	return love.graphics.newImage(imageData)
+end
+
+local transform
+local args = {}
+function gfx_util.transform(t)
+	for i = 1, 9 do
+		local value = t[i]
+		if type(value) == "table" then
+			local w, h = love.graphics.getDimensions()
+			args[i] = value[1] * w + value[2] * h + (value[3] or 0)
+		elseif type(value) == "number" then
+			args[i] = value
+		elseif type(value) == "function" then
+			args[i] = value()
+		else
+			error("Invalid value: " .. i)
+		end
+	end
+
+	transform = transform or love.math.newTransform()
+	return transform:setTransformation(unpack(args))
+end
+
+local canvases = {}
+
+local function newCanvas(w, h)
+	local _, _, flags = love.window.getMode()
+	return love.graphics.newCanvas(w, h, {msaa = flags.msaa})
+end
+
+function gfx_util.getCanvas(key)
+	local w, h = love.graphics.getDimensions()
+	if not canvases[key] then
+		canvases[key] = newCanvas(w, h)
+		return canvases[key]
+	end
+	local canvas = canvases[key]
+	if canvas:getWidth() ~= w or canvas:getHeight() ~= h then
+		canvas:release()
+		canvases[key] = newCanvas(w, h)
+	end
+	return canvases[key]
+end
+
+function gfx_util.layout(offset, size, _w)
+	local w = {}
+	local x = {}
+
+	local piexls = 0
+	for i = 1, #_w do
+		local v = _w[i]
+		if v ~= "*" and v > 0 then
+			piexls = piexls + _w[i]
+		end
+	end
+
+	local pos = offset
+	local fill = false
+	for i = 1, #_w do
+		local v = _w[i]
+		w[i] = v
+		if v == "*" then
+			w[i] = 0
+			assert(not fill)
+			fill = true
+		elseif v < 0 then
+			w[i] = -v * (size - piexls)
+		end
+		pos = pos + w[i]
+	end
+
+	local rest = size - pos
+	pos = offset
+
+	for i = 1, #_w do
+		if w[i] == 0 then
+			w[i] = rest
+		end
+		x[i] = pos
+		pos = pos + w[i]
+	end
+
+	return x, w
+end
+
+return gfx_util
diff --git a/aqua/http_util.lua b/http_util.lua
similarity index 100%
rename from aqua/http_util.lua
rename to http_util.lua
diff --git a/aqua/util/linreg.lua b/linreg.lua
similarity index 100%
rename from aqua/util/linreg.lua
rename to linreg.lua
diff --git a/aqua/math.lua b/math_util.lua
similarity index 100%
rename from aqua/math.lua
rename to math_util.lua
diff --git a/aqua/package.lua b/package.lua
similarity index 100%
rename from aqua/package.lua
rename to package.lua
diff --git a/aqua/physfs.lua b/physfs.lua
similarity index 100%
rename from aqua/physfs.lua
rename to physfs.lua
diff --git a/aqua/util/rcopy.lua b/rcopy.lua
similarity index 100%
rename from aqua/util/rcopy.lua
rename to rcopy.lua
diff --git a/aqua/util/remote.lua b/remote.lua
similarity index 100%
rename from aqua/util/remote.lua
rename to remote.lua
diff --git a/aqua/util/safeload.lua b/safeload.lua
similarity index 100%
rename from aqua/util/safeload.lua
rename to safeload.lua
diff --git a/aqua/util/sort.lua b/sort.lua
similarity index 100%
rename from aqua/util/sort.lua
rename to sort.lua
diff --git a/aqua/string.lua b/string.lua
similarity index 100%
rename from aqua/string.lua
rename to string.lua
diff --git a/aqua/util/synctable.lua b/synctable.lua
similarity index 100%
rename from aqua/util/synctable.lua
rename to synctable.lua
diff --git a/table_util.lua b/table_util.lua
new file mode 100644
index 0000000..387234c
--- /dev/null
+++ b/table_util.lua
@@ -0,0 +1,93 @@
+local table_util = {}
+
+function table_util.leftequal(a, b)
+	for key in pairs(a) do
+		if a[key] ~= b[key] then
+			return
+		end
+	end
+
+	return true
+end
+
+function table_util.equal(a, b)
+	return table.leftequal(a, b) and table.leftequal(b, a)
+end
+
+function table_util.deepcopy(t)
+	if type(t) ~= "table" then
+		return t
+	end
+	local out = {}
+	for k, v in pairs(t) do
+		if type(v) == "table" then
+			out[k] = table_util.deepcopy(v)
+		else
+			out[k] = v
+		end
+	end
+	return out
+end
+
+function table_util.array_update(new, old, new_f, old_f)
+	local _new = {}
+	for _, v in ipairs(new) do
+		if new_f then v = new_f(v) end
+		_new[v] = true
+	end
+
+	local _old = {}
+	for _, v in ipairs(old) do
+		if old_f then v = old_f(v) end
+		_old[v] = true
+	end
+
+	new = {}
+	old = {}
+	local all = {}
+	for v in pairs(_new) do
+		if not _old[v] then
+			table.insert(new, v)
+		end
+		table.insert(all, v)
+	end
+	for v in pairs(_old) do
+		if not _new[v] then
+			table.insert(old, v)
+		end
+	end
+
+	return new, old, all
+end
+
+function table_util.inside(t, key)
+	local subvalue = t
+	if type(key) == "table" then
+		for _, subkey in ipairs(key) do
+			if type(subkey) == "table" then
+				local k = subkey[1]
+				local f = subkey[2]
+				local v = table_util.inside(t, k)
+				if v and f(t) then
+					return v
+				end
+			elseif type(subkey) == "string" then
+				local v = table_util.inside(t, subkey)
+				if v then
+					return v
+				end
+			end
+		end
+		return
+	elseif type(key) == "string" then
+		for subkey in key:gmatch("[^.]+") do
+			if type(subvalue) ~= "table" then
+				return
+			end
+			subvalue = subvalue[subkey]
+		end
+		return subvalue
+	end
+end
+
+return table_util
diff --git a/aqua/thread/Thread.lua b/thread/Thread.lua
similarity index 96%
rename from aqua/thread/Thread.lua
rename to thread/Thread.lua
index b80232f..e4175aa 100644
--- a/aqua/thread/Thread.lua
+++ b/thread/Thread.lua
@@ -1,5 +1,5 @@
-local Class = require("aqua.util.Class")
-local synctable = require("aqua.util.synctable")
+local Class = require("Class")
+local synctable = require("synctable")
 
 local Thread = Class:new()
 
diff --git a/aqua/thread/ThreadPool.lua b/thread/ThreadPool.lua
similarity index 94%
rename from aqua/thread/ThreadPool.lua
rename to thread/ThreadPool.lua
index 53d8638..8ed76fb 100644
--- a/aqua/thread/ThreadPool.lua
+++ b/thread/ThreadPool.lua
@@ -1,5 +1,5 @@
-local Thread = require("aqua.thread.Thread")
-local synctable = require("aqua.util.synctable")
+local Thread = require("thread.Thread")
+local synctable = require("synctable")
 
 local ThreadPool = {}
 
@@ -108,7 +108,7 @@ ThreadPool.createThread = function(self, id)
 	thread.id = id
 
 	if not self.codestring then
-		local path = "aqua/aqua/thread/threadcode.lua"
+		local path = "aqua/thread/threadcode.lua"
 		self.codestring = love.filesystem.read(path)
 	end
 	thread:create(self.codestring:gsub('"<threadId>"', id))
diff --git a/aqua/thread/init.lua b/thread/init.lua
similarity index 93%
rename from aqua/thread/init.lua
rename to thread/init.lua
index 1cfa8ac..4fc56a7 100644
--- a/aqua/thread/init.lua
+++ b/thread/init.lua
@@ -1,7 +1,7 @@
 local thread = {}
 
-local Thread = require("aqua.thread.Thread")
-local ThreadPool = require("aqua.thread.ThreadPool")
+local Thread = require("thread.Thread")
+local ThreadPool = require("thread.ThreadPool")
 thread.Thread = Thread
 thread.ThreadPool = ThreadPool
 
diff --git a/aqua/thread/threadcode.lua b/thread/threadcode.lua
similarity index 96%
rename from aqua/thread/threadcode.lua
rename to thread/threadcode.lua
index b742bae..d0a0df7 100644
--- a/aqua/thread/threadcode.lua
+++ b/thread/threadcode.lua
@@ -8,7 +8,7 @@ local internalOutputChannel = love.thread.getChannel("internalOutput" .. threadI
 local inputChannel = love.thread.getChannel("input" .. threadId)
 local outputChannel = love.thread.getChannel("output" .. threadId)
 
-local synctable = require("aqua.util.synctable")
+local synctable = require("synctable")
 
 _G.thread = {}
 
diff --git a/aqua/time_util.lua b/time_util.lua
similarity index 100%
rename from aqua/time_util.lua
rename to time_util.lua
diff --git a/aqua/utf8.lua b/utf8validate.lua
similarity index 85%
rename from aqua/utf8.lua
rename to utf8validate.lua
index efd87f3..fbd7aca 100644
--- a/aqua/utf8.lua
+++ b/utf8validate.lua
@@ -1,9 +1,7 @@
 local ffi = require("ffi")
 local utf8 = require("utf8")
 
-local _utf8 = {}
-
-_utf8.validate = function(s, c)
+return function(s, c)
 	c = c or "?"
 	local size = #s
 	local buffer = ffi.new("char[?]", size)
@@ -20,5 +18,3 @@ _utf8.validate = function(s, c)
 
 	return ffi.string(buffer, size)
 end
-
-return _utf8
diff --git a/aqua/video.c b/video.c
similarity index 100%
rename from aqua/video.c
rename to video.c