diff --git a/scripts/batch-2d.sh b/scripts/batch-2d.sh
index 982db09f..4ee3855e 100755
--- a/scripts/batch-2d.sh
+++ b/scripts/batch-2d.sh
@@ -5,7 +5,7 @@ cmd="openscad"
 [ -x "./OpenSCAD.app/Contents/MacOS/OpenSCAD" ] && cmd="./OpenSCAD.app/Contents/MacOS/OpenSCAD"
 
 mkdir -p output
-for f in testdata/*.dxf; do
+for f in testdata/dxf/*.dxf; do
   echo `basename $f`
   cat > tmp.scad << EOF
   import_dxf("$f");
diff --git a/test-code/batch-cgal.sh b/test-code/batch-cgal.sh
new file mode 100755
index 00000000..ea587bee
--- /dev/null
+++ b/test-code/batch-cgal.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cmd="./cgaltest"
+
+if [ $# == 0 ]; then
+  dir=../testdata/scad
+else
+  dir=$1
+fi
+
+for f in $dir/*.scad; do
+  echo == `basename $f` ==
+  "$cmd" "$f"
+done
diff --git a/test-code/batch-dump.sh b/test-code/batch-dump.sh
new file mode 100755
index 00000000..9db4fb5b
--- /dev/null
+++ b/test-code/batch-dump.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cmd="./dumptest"
+
+if [ $# == 0 ]; then
+  dir=../testdata/scad
+else
+  dir=$1
+fi
+
+for f in $dir/*.scad; do
+  echo `basename $f`
+  "$cmd" "$f"
+done
diff --git a/testdata/arc.dxf b/testdata/dxf/arc.dxf
similarity index 100%
rename from testdata/arc.dxf
rename to testdata/dxf/arc.dxf
diff --git a/testdata/circle-advanced.dxf b/testdata/dxf/circle-advanced.dxf
similarity index 100%
rename from testdata/circle-advanced.dxf
rename to testdata/dxf/circle-advanced.dxf
diff --git a/testdata/circle-double.dxf b/testdata/dxf/circle-double.dxf
similarity index 100%
rename from testdata/circle-double.dxf
rename to testdata/dxf/circle-double.dxf
diff --git a/testdata/circle-small.dxf b/testdata/dxf/circle-small.dxf
similarity index 100%
rename from testdata/circle-small.dxf
rename to testdata/dxf/circle-small.dxf
diff --git a/testdata/circle.dxf b/testdata/dxf/circle.dxf
similarity index 100%
rename from testdata/circle.dxf
rename to testdata/dxf/circle.dxf
diff --git a/testdata/ellipse-arc-rot.dxf b/testdata/dxf/ellipse-arc-rot.dxf
similarity index 100%
rename from testdata/ellipse-arc-rot.dxf
rename to testdata/dxf/ellipse-arc-rot.dxf
diff --git a/testdata/ellipse-arc.dxf b/testdata/dxf/ellipse-arc.dxf
similarity index 100%
rename from testdata/ellipse-arc.dxf
rename to testdata/dxf/ellipse-arc.dxf
diff --git a/testdata/ellipse-reverse.dxf b/testdata/dxf/ellipse-reverse.dxf
similarity index 100%
rename from testdata/ellipse-reverse.dxf
rename to testdata/dxf/ellipse-reverse.dxf
diff --git a/testdata/ellipse-rot.dxf b/testdata/dxf/ellipse-rot.dxf
similarity index 100%
rename from testdata/ellipse-rot.dxf
rename to testdata/dxf/ellipse-rot.dxf
diff --git a/testdata/ellipse.dxf b/testdata/dxf/ellipse.dxf
similarity index 100%
rename from testdata/ellipse.dxf
rename to testdata/dxf/ellipse.dxf
diff --git a/testdata/lwpolyline-closed.dxf b/testdata/dxf/lwpolyline-closed.dxf
similarity index 100%
rename from testdata/lwpolyline-closed.dxf
rename to testdata/dxf/lwpolyline-closed.dxf
diff --git a/testdata/lwpolyline.dxf b/testdata/dxf/lwpolyline.dxf
similarity index 100%
rename from testdata/lwpolyline.dxf
rename to testdata/dxf/lwpolyline.dxf
diff --git a/testdata/lwpolyline2.dxf b/testdata/dxf/lwpolyline2.dxf
similarity index 100%
rename from testdata/lwpolyline2.dxf
rename to testdata/dxf/lwpolyline2.dxf
diff --git a/testdata/polygon-concave-hole.dxf b/testdata/dxf/polygon-concave-hole.dxf
similarity index 100%
rename from testdata/polygon-concave-hole.dxf
rename to testdata/dxf/polygon-concave-hole.dxf
diff --git a/testdata/polygon-concave-simple.dxf b/testdata/dxf/polygon-concave-simple.dxf
similarity index 100%
rename from testdata/polygon-concave-simple.dxf
rename to testdata/dxf/polygon-concave-simple.dxf
diff --git a/testdata/polygon-concave.dxf b/testdata/dxf/polygon-concave.dxf
similarity index 100%
rename from testdata/polygon-concave.dxf
rename to testdata/dxf/polygon-concave.dxf
diff --git a/testdata/polygon-holes-touch.dxf b/testdata/dxf/polygon-holes-touch.dxf
similarity index 100%
rename from testdata/polygon-holes-touch.dxf
rename to testdata/dxf/polygon-holes-touch.dxf
diff --git a/testdata/polygon-intersect.dxf b/testdata/dxf/polygon-intersect.dxf
similarity index 100%
rename from testdata/polygon-intersect.dxf
rename to testdata/dxf/polygon-intersect.dxf
diff --git a/testdata/polygon-many-holes.dxf b/testdata/dxf/polygon-many-holes.dxf
similarity index 100%
rename from testdata/polygon-many-holes.dxf
rename to testdata/dxf/polygon-many-holes.dxf
diff --git a/testdata/polygon-mesh.dxf b/testdata/dxf/polygon-mesh.dxf
similarity index 100%
rename from testdata/polygon-mesh.dxf
rename to testdata/dxf/polygon-mesh.dxf
diff --git a/testdata/polygon-overlap.dxf b/testdata/dxf/polygon-overlap.dxf
similarity index 100%
rename from testdata/polygon-overlap.dxf
rename to testdata/dxf/polygon-overlap.dxf
diff --git a/testdata/polygon-riser.dxf b/testdata/dxf/polygon-riser.dxf
similarity index 100%
rename from testdata/polygon-riser.dxf
rename to testdata/dxf/polygon-riser.dxf
diff --git a/testdata/polygon-self-intersect.dxf b/testdata/dxf/polygon-self-intersect.dxf
similarity index 100%
rename from testdata/polygon-self-intersect.dxf
rename to testdata/dxf/polygon-self-intersect.dxf
diff --git a/testdata/polygon8.dxf b/testdata/dxf/polygon8.dxf
similarity index 100%
rename from testdata/polygon8.dxf
rename to testdata/dxf/polygon8.dxf
diff --git a/testdata/polygons.dxf b/testdata/dxf/polygons.dxf
similarity index 100%
rename from testdata/polygons.dxf
rename to testdata/dxf/polygons.dxf
diff --git a/testdata/triangle-with-duplicate-vertex.dxf b/testdata/dxf/triangle-with-duplicate-vertex.dxf
similarity index 100%
rename from testdata/triangle-with-duplicate-vertex.dxf
rename to testdata/dxf/triangle-with-duplicate-vertex.dxf
diff --git a/testdata/dim-all.dxf b/testdata/scad/dim-all.dxf
similarity index 100%
rename from testdata/dim-all.dxf
rename to testdata/scad/dim-all.dxf
diff --git a/testdata/dim-all.scad b/testdata/scad/dim-all.scad
similarity index 100%
rename from testdata/dim-all.scad
rename to testdata/scad/dim-all.scad
diff --git a/testdata/null-polygons.dxf b/testdata/scad/null-polygons.dxf
similarity index 100%
rename from testdata/null-polygons.dxf
rename to testdata/scad/null-polygons.dxf
diff --git a/testdata/null-polygons.scad b/testdata/scad/null-polygons.scad
similarity index 100%
rename from testdata/null-polygons.scad
rename to testdata/scad/null-polygons.scad
diff --git a/testdata/transform-insert.dxf b/testdata/scad/transform-insert.dxf
similarity index 100%
rename from testdata/transform-insert.dxf
rename to testdata/scad/transform-insert.dxf
diff --git a/testdata/transform-insert.scad b/testdata/scad/transform-insert.scad
similarity index 100%
rename from testdata/transform-insert.scad
rename to testdata/scad/transform-insert.scad