26 files changed, 37 insertions, 37 deletions
diff --git a/libdimension/tests/Makefile.am b/libdimension/tests/Makefile.am
index f9ff11f..3c10a54 100644
--- a/libdimension/tests/Makefile.am
+++ b/libdimension/tests/Makefile.am
@@ -67,71 +67,71 @@ libdimension_unit_test_la_SOURCES = unit-test.c
 libdimension_unit_test_la_CFLAGS  = $(CHECK_CFLAGS) $(AM_CFLAGS)
 libdimension_unit_test_la_LIBADD  = $(CHECK_LIBS) $(top_builddir)/libdimension/libdimension.la
 
-modules_test_SOURCES = modules/base.c \
-  modules/canvas.c \
-  modules/color.c \
-  modules/concurrency.c \
-  modules/math.c \
-  modules/model.c \
-  modules/pattern.c \
-  modules/platform.c \
-  modules/render.c
+modules_test_SOURCES = build/modules/base.c \
+  build/modules/canvas.c \
+  build/modules/color.c \
+  build/modules/concurrency.c \
+  build/modules/math.c \
+  build/modules/model.c \
+  build/modules/pattern.c \
+  build/modules/platform.c \
+  build/modules/render.c
 modules_test_LDADD   = libdimension-unit-test.la
 
-c89_test_SOURCES = c89.c
+c89_test_SOURCES = build/c89.c
 c89_test_LDADD   = libdimension-tests.la
 
 c89.o: CFLAGS += -std=c89 -Wpedantic
 
-c99_test_SOURCES = c99.c
+c99_test_SOURCES = build/c99.c
 c99_test_LDADD   = libdimension-tests.la
 
 c99.o: CFLAGS += -std=c99 -Wpedantic
 
-c__03_test_SOURCES = c++03.cpp
+c__03_test_SOURCES = build/c++03.cpp
 c__03_test_LDADD   = libdimension-tests.la
 
 c++03.o: CFLAGS += -std=c++03 -Wpedantic
 
-c__11_test_SOURCES = c++11.cpp
+c__11_test_SOURCES = build/c++11.cpp
 c__11_test_LDADD   = libdimension-tests.la
 
 c++11.o: CFLAGS += -std=c++11 -Wpedantic
 
-warning_test_SOURCES = warning.c
+warning_test_SOURCES = base/error/warning.c
 warning_test_LDADD   = libdimension-tests.la
 
-warning_as_error_test_SOURCES = warning-as-error.c
+warning_as_error_test_SOURCES = base/error/warning-as-error.c
 warning_as_error_test_LDADD   = libdimension-tests.la
 
-error_test_SOURCES = error.c
+error_test_SOURCES = base/error/error.c
 error_test_LDADD   = libdimension-tests.la
 
-custom_error_fn_test_SOURCES = custom-error-fn.c
+custom_error_fn_test_SOURCES = base/error/custom-error-fn.c
 custom_error_fn_test_LDADD   = libdimension-tests.la
 
-pool_test_SOURCES = pool.c
+pool_test_SOURCES = base/pool.c
 pool_test_LDADD   = libdimension-unit-test.la
 
-dictionary_test_SOURCES = dictionary.c
+dictionary_test_SOURCES = base/dictionary.c
 dictionary_test_LDADD   = libdimension-unit-test.la
 
-polynomial_test_SOURCES = polynomial.c
+polynomial_test_SOURCES = math/polynomial.c
 polynomial_test_LDADD   = libdimension-unit-test.la
 
-prtree_test_SOURCES = prtree.c
+prtree_test_SOURCES = bvh/prtree.c
 prtree_test_LDADD   = libdimension-tests.la
 
-future_test_SOURCES = future.c
+future_test_SOURCES = concurrency/future.c
 future_test_LDADD   = libdimension-unit-test.la
 
-png_test_SOURCES = png.c
+png_test_SOURCES = canvas/png.c
 png_test_LDADD   = libdimension-tests.la
 
-gl_test_SOURCES = gl.c
+gl_test_SOURCES = canvas/gl.c
 gl_test_LDADD   = libdimension-tests.la
 
-render_test_SOURCES = render.c
+render_test_SOURCES = render/render.c
 render_test_LDADD   = libdimension-tests.la
 
 clean-local:
diff --git a/libdimension/tests/dictionary.c b/libdimension/tests/base/dictionary.c
index 117887a..117887a 100644
--- a/libdimension/tests/dictionary.c
+++ b/libdimension/tests/base/dictionary.c
diff --git a/libdimension/tests/custom-error-fn.c b/libdimension/tests/base/error/custom-error-fn.c
index 49a0f9e..49a0f9e 100644
--- a/libdimension/tests/custom-error-fn.c
+++ b/libdimension/tests/base/error/custom-error-fn.c
diff --git a/libdimension/tests/error.c b/libdimension/tests/base/error/error.c
index 58a5b43..58a5b43 100644
--- a/libdimension/tests/error.c
+++ b/libdimension/tests/base/error/error.c
diff --git a/libdimension/tests/warning-as-error.c b/libdimension/tests/base/error/warning-as-error.c
index 7d0fdb7..7d0fdb7 100644
--- a/libdimension/tests/warning-as-error.c
+++ b/libdimension/tests/base/error/warning-as-error.c
diff --git a/libdimension/tests/warning.c b/libdimension/tests/base/error/warning.c
index cc1aed1..cc1aed1 100644
--- a/libdimension/tests/warning.c
+++ b/libdimension/tests/base/error/warning.c
diff --git a/libdimension/tests/pool.c b/libdimension/tests/base/pool.c
index 6090c36..f8b1259 100644
--- a/libdimension/tests/pool.c
+++ b/libdimension/tests/base/pool.c
@@ -22,9 +22,9 @@
  * Tests for memory pools.
  */
 
-#include "../concurrency/future.c"
-#include "../concurrency/threads.c"
-#include "../internal.h"
+#include "../../concurrency/future.c"
+#include "../../concurrency/threads.c"
+#include "../../internal.h"
 #include "tests.h"
 
 static dmnsn_pool *pool;
diff --git a/libdimension/tests/c++03.cpp b/libdimension/tests/build/c++03.cpp
index 679fa23..679fa23 100644
--- a/libdimension/tests/c++03.cpp
+++ b/libdimension/tests/build/c++03.cpp
diff --git a/libdimension/tests/c++11.cpp b/libdimension/tests/build/c++11.cpp
index 679fa23..679fa23 100644
--- a/libdimension/tests/c++11.cpp
+++ b/libdimension/tests/build/c++11.cpp
diff --git a/libdimension/tests/c89.c b/libdimension/tests/build/c89.c
index 9393184..9393184 100644
--- a/libdimension/tests/c89.c
+++ b/libdimension/tests/build/c89.c
diff --git a/libdimension/tests/c99.c b/libdimension/tests/build/c99.c
index e1a04ef..e1a04ef 100644
--- a/libdimension/tests/c99.c
+++ b/libdimension/tests/build/c99.c
diff --git a/libdimension/tests/modules/base.c b/libdimension/tests/build/modules/base.c
index 665c62f..665c62f 100644
--- a/libdimension/tests/modules/base.c
+++ b/libdimension/tests/build/modules/base.c
diff --git a/libdimension/tests/modules/canvas.c b/libdimension/tests/build/modules/canvas.c
index e9e0471..e9e0471 100644
--- a/libdimension/tests/modules/canvas.c
+++ b/libdimension/tests/build/modules/canvas.c
diff --git a/libdimension/tests/modules/color.c b/libdimension/tests/build/modules/color.c
index 6c9e63f..6c9e63f 100644
--- a/libdimension/tests/modules/color.c
+++ b/libdimension/tests/build/modules/color.c
diff --git a/libdimension/tests/modules/concurrency.c b/libdimension/tests/build/modules/concurrency.c
index 16bb305..16bb305 100644
--- a/libdimension/tests/modules/concurrency.c
+++ b/libdimension/tests/build/modules/concurrency.c
diff --git a/libdimension/tests/modules/math.c b/libdimension/tests/build/modules/math.c
index 5bf3ac1..5bf3ac1 100644
--- a/libdimension/tests/modules/math.c
+++ b/libdimension/tests/build/modules/math.c
diff --git a/libdimension/tests/modules/model.c b/libdimension/tests/build/modules/model.c
index 9bd5f00..9bd5f00 100644
--- a/libdimension/tests/modules/model.c
+++ b/libdimension/tests/build/modules/model.c
diff --git a/libdimension/tests/modules/pattern.c b/libdimension/tests/build/modules/pattern.c
index 46bb99e..46bb99e 100644
--- a/libdimension/tests/modules/pattern.c
+++ b/libdimension/tests/build/modules/pattern.c
diff --git a/libdimension/tests/modules/platform.c b/libdimension/tests/build/modules/platform.c
index b0fc978..b0fc978 100644
--- a/libdimension/tests/modules/platform.c
+++ b/libdimension/tests/build/modules/platform.c
diff --git a/libdimension/tests/modules/render.c b/libdimension/tests/build/modules/render.c
index a508c9f..a508c9f 100644
--- a/libdimension/tests/modules/render.c
+++ b/libdimension/tests/build/modules/render.c
diff --git a/libdimension/tests/prtree.c b/libdimension/tests/bvh/prtree.c
index 8824e93..fb0cea6 100644
--- a/libdimension/tests/prtree.c
+++ b/libdimension/tests/bvh/prtree.c
@@ -22,11 +22,11 @@
  * Basic tests of PR-trees.
  */
 
-#include "../platform/platform.c"
-#include "../concurrency/threads.c"
-#include "../concurrency/future.c"
-#include "../bvh/bvh.c"
-#include "../bvh/prtree.c"
+#include "../../platform/platform.c"
+#include "../../concurrency/threads.c"
+#include "../../concurrency/future.c"
+#include "../../bvh/bvh.c"
+#include "../../bvh/prtree.c"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/libdimension/tests/gl.c b/libdimension/tests/canvas/gl.c
index 1546d6c..1546d6c 100644
--- a/libdimension/tests/gl.c
+++ b/libdimension/tests/canvas/gl.c
diff --git a/libdimension/tests/png.c b/libdimension/tests/canvas/png.c
index 7311e43..7311e43 100644
--- a/libdimension/tests/png.c
+++ b/libdimension/tests/canvas/png.c
diff --git a/libdimension/tests/future.c b/libdimension/tests/concurrency/future.c
index a223a44..b226e4f 100644
--- a/libdimension/tests/future.c
+++ b/libdimension/tests/concurrency/future.c
@@ -22,9 +22,9 @@
  * Tests for dmnsn_future.
  */
 
-#include "../platform/platform.c"
-#include "../concurrency/future.c"
-#include "../concurrency/threads.c"
+#include "../../platform/platform.c"
+#include "../../concurrency/future.c"
+#include "../../concurrency/threads.c"
 #include "tests.h"
 #include <stdatomic.h>
 
diff --git a/libdimension/tests/polynomial.c b/libdimension/tests/math/polynomial.c
index a983bd4..eaa15cf 100644
--- a/libdimension/tests/polynomial.c
+++ b/libdimension/tests/math/polynomial.c
@@ -22,7 +22,7 @@
  * Basic tests of the polynomial root-finder.
  */
 
-#include "../math/polynomial.c"
+#include "../../math/polynomial.c"
 #include "tests.h"
 #include <stdarg.h>
 
diff --git a/libdimension/tests/render.c b/libdimension/tests/render/render.c
index fd1e96d..fd1e96d 100644
--- a/libdimension/tests/render.c
+++ b/libdimension/tests/render/render.c