diff --git a/.gitignore b/.gitignore
index eaf1478..678310a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-test/test_*
-test/test.*
+test/build
 .vscode/*
diff --git a/README.md b/README.md
index 4186d16..9901a9c 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 Shim your code to support Unicode across all platforms.
 
-| Php | Python | Java | C# | Js/Node | Interp | Neko | HashLink | Lua | CPP |
-| - | -| - | - | - | -| - | - | - | - |
-| ✅ | ✅     | ✅  | ✅ | ✅     | ✅ | ✅  | ✅       | ➖ | ➖ |
+| PHP | Python | Java | C# | JS/Node | Interp | Neko | HashLink | Lua | C++ |
+| -   | -      | -    | -  | -       | -      | -    | -        | -   | -   |
+| ✅ | ✅     | ✅   | ✅ | ✅     | ✅    | ✅  | ✅       | ➖  | ➖ |
 
 ## Usage
 
@@ -78,5 +78,4 @@ InternalEncoding.charAt("эюя", InternalEncoding.codePointWidthAt("эюя", 0)
 
 ## Target Notes
 
-- Some targets will break, silently on some targets, when trying handle the Null character.
-- The Lua target has not been tested.
\ No newline at end of file
+- Some targets will break, silently on some targets, when trying handle the Null character.
\ No newline at end of file
diff --git a/build.cpp.hxml b/build.cpp.hxml
index c803d4b..7b118c5 100644
--- a/build.cpp.hxml
+++ b/build.cpp.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--cpp test/test_cpp
--cmd test/test_cpp/Main
\ No newline at end of file
+-cpp test/build/test_cpp
+-cmd test/build/test_cpp/Main
\ No newline at end of file
diff --git a/build.cs.hxml b/build.cs.hxml
index 8c643ec..ae1001f 100644
--- a/build.cs.hxml
+++ b/build.cs.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--cs test/test_cs
--cmd mono test/test_cs/bin/Main.exe
\ No newline at end of file
+-cs test/build/test_cs
+-cmd mono test/build/test_cs/bin/Main.exe
\ No newline at end of file
diff --git a/build.hl.hxml b/build.hl.hxml
index 58e9a10..b8dd61e 100644
--- a/build.hl.hxml
+++ b/build.hl.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--hl test/test.hl
--cmd hl test/test.hl
\ No newline at end of file
+-hl test/build/test.hl
+-cmd hl test/build/test.hl
\ No newline at end of file
diff --git a/build.java.hxml b/build.java.hxml
index 7d7984e..adf2177 100644
--- a/build.java.hxml
+++ b/build.java.hxml
@@ -7,5 +7,5 @@
 -main test.Main
 
 #-D jvm
--java test/test_java
--cmd java -jar test/test_java/Main.jar
\ No newline at end of file
+-java test/build/test_java
+-cmd java -jar test/build/test_java/Main.jar
\ No newline at end of file
diff --git a/build.js.hxml b/build.js.hxml
index 5806c52..07a00b7 100644
--- a/build.js.hxml
+++ b/build.js.hxml
@@ -7,5 +7,5 @@
 
 -main test.Main
 
--js test/test.js
--cmd node test/test.js
\ No newline at end of file
+-js test/build/test.js
+-cmd node test/build/test.js
\ No newline at end of file
diff --git a/build.jvm.hxml b/build.jvm.hxml
index 3ef2594..a2cae4c 100644
--- a/build.jvm.hxml
+++ b/build.jvm.hxml
@@ -7,5 +7,5 @@
 -main test.Main
 
 -D jvm
--java test/test_java
--cmd java -jar test/test_java/Main.jar
\ No newline at end of file
+-java test/build/test_java
+-cmd java -jar test/build/test_java/Main.jar
\ No newline at end of file
diff --git a/build.lua.hxml b/build.lua.hxml
index 306a0ed..721a48a 100644
--- a/build.lua.hxml
+++ b/build.lua.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--lua test/test.lua
--cmd lua test/test.lua
\ No newline at end of file
+-lua test/build/test.lua
+-cmd lua test/build/test.lua
\ No newline at end of file
diff --git a/build.neko.hxml b/build.neko.hxml
index 32da873..7bf7a93 100644
--- a/build.neko.hxml
+++ b/build.neko.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--neko test/test.n
--cmd neko test/test.n
\ No newline at end of file
+-neko test/build/test.n
+-cmd neko test/build/test.n
\ No newline at end of file
diff --git a/build.php.hxml b/build.php.hxml
index d270b7f..239fc28 100644
--- a/build.php.hxml
+++ b/build.php.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--php test/test_php
--cmd php test/test_php/index.php
\ No newline at end of file
+-php test/build/test_php
+-cmd php test/build/test_php/index.php
\ No newline at end of file
diff --git a/build.python.hxml b/build.python.hxml
index baf7f43..6442634 100644
--- a/build.python.hxml
+++ b/build.python.hxml
@@ -6,5 +6,5 @@
 
 -main test.Main
 
--python test/test.py
--cmd python test/test.py
\ No newline at end of file
+-python test/build/test.py
+-cmd python test/build/test.py
\ No newline at end of file
diff --git a/compile-test.hxml b/compile-test.hxml
index 62519d6..1e87431 100644
--- a/compile-test.hxml
+++ b/compile-test.hxml
@@ -12,41 +12,41 @@
 
 --next
 
--neko test/test.n
--cmd neko test/test.n
+-neko test/build/test.n
+-cmd neko test/build/test.n
 
 --next
--php test/test_php
--cmd php test/test_php/index.php
+-php test/build/test_php
+-cmd php test/build/test_php/index.php
 
 --next
--js test/test.js
--cmd node test/test.js
+-js test/build/test.js
+-cmd node test/build/test.js
 
 #--next
-#-swf test/test.swf
+#-swf test/build/test.swf
 
 --next
--java test/test_java
--cmd java -jar test/test_java/Main.jar
+-java test/build/test_java
+-cmd java -jar test/build/test_java/Main.jar
 
 --next
--java test/test_jvm
+-java test/build/test_jvm
 -D jvm
--cmd java -jar test/test_jvm/Main.jar
+-cmd java -jar test/build/test_jvm/Main.jar
 
 --next
--cpp test/test_cpp
--cmd test/test_cpp/Main
+-cpp test/build/test_cpp
+-cmd test/build/test_cpp/Main
 
 --next
--cs test/test_cs
--cmd mono test/test_cs/bin/Main.exe
+-cs test/build/test_cs
+-cmd mono test/build/test_cs/bin/Main.exe
 
 --next
--python test/test.py
--cmd python test/test.py
+-python test/build/test.py
+-cmd python test/build/test.py
 
 --next
--lua test/test.lua
--cmd lua test/test.lua
+-lua test/build/test.lua
+-cmd lua test/build/test.lua
diff --git a/run-test-on-docker.sh b/run-test-on-docker.sh
index 5530a6e..246c4af 100644
--- a/run-test-on-docker.sh
+++ b/run-test-on-docker.sh
@@ -1,5 +1,5 @@
 dir="$(dirname "$(readlink -f "$0")")"
 
 docker build -t mandel59/unifill-test-runner -f unifill-test-runner.dockerfile .
-mkdir -p "$dir/test"
-docker run --volume "$dir/test:/opt/unifill/test" mandel59/unifill-test-runner lix compile-test.hxml
+mkdir -p "$dir/test/build"
+docker run --volume "$dir/test/build:/opt/unifill/test/build" mandel59/unifill-test-runner lix compile-test.hxml