diff --git a/tests/benchmark_images_shadows.nim b/tests/benchmark_images_shadows.nim
index 8343fcf..593b6c2 100644
--- a/tests/benchmark_images_shadows.nim
+++ b/tests/benchmark_images_shadows.nim
@@ -16,7 +16,7 @@ block:
   b.fill(rgba(255, 255, 255, 255))
   a.draw(b, vec2(25, 25))
 
-  a.writeFile("tests/images/spread1.png")
+  # a.writeFile("tests/images/spread1.png")
 
 block:
   var a = newImage(100, 100)
@@ -33,7 +33,7 @@ block:
   b.fill(rgba(255, 255, 255, 255))
   a.draw(b, vec2(25, 25))
 
-  a.writeFile("tests/images/blur1.png")
+  # a.writeFile("tests/images/blur1.png")
 
 block:
   var shadow: Image
@@ -57,7 +57,7 @@ block:
   shadow.draw(b, vec2(25, 25))
   keep(shadow)
 
-  shadow.writeFile("tests/images/shadow1.png")
+  # shadow.writeFile("tests/images/shadow1.png")
 
 
 # import print
diff --git a/tests/images/bench.draw.Smooth.bmNormal.png b/tests/images/bench.draw.Smooth.bmNormal.png
deleted file mode 100644
index d1d438a..0000000
Binary files a/tests/images/bench.draw.Smooth.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.draw.bmNormal.png b/tests/images/bench.draw.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.draw.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawBlend.bmNormal.png b/tests/images/bench.drawBlend.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawBlend.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawBlend.bmOverwrite.png b/tests/images/bench.drawBlend.bmOverwrite.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawBlend.bmOverwrite.png and /dev/null differ
diff --git a/tests/images/bench.drawBlend.bmSaturation.png b/tests/images/bench.drawBlend.bmSaturation.png
deleted file mode 100644
index 6bd6a7c..0000000
Binary files a/tests/images/bench.drawBlend.bmSaturation.png and /dev/null differ
diff --git a/tests/images/bench.drawBlendSmooth.bmNormal.png b/tests/images/bench.drawBlendSmooth.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawBlendSmooth.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawBlendSmooth.bmOverwrite.png b/tests/images/bench.drawBlendSmooth.bmOverwrite.png
deleted file mode 100644
index f97dd77..0000000
Binary files a/tests/images/bench.drawBlendSmooth.bmOverwrite.png and /dev/null differ
diff --git a/tests/images/bench.drawBlendSmooth.bmSaturation.png b/tests/images/bench.drawBlendSmooth.bmSaturation.png
deleted file mode 100644
index 6bd6a7c..0000000
Binary files a/tests/images/bench.drawBlendSmooth.bmSaturation.png and /dev/null differ
diff --git a/tests/images/bench.drawBlendSmooth2.bmNormal.png b/tests/images/bench.drawBlendSmooth2.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawBlendSmooth2.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawCorrect.bmNormal.png b/tests/images/bench.drawCorrect.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawCorrect.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawInPlace.bmNormal.png b/tests/images/bench.drawInPlace.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawInPlace.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawOverwrite.bmOverwrite.png b/tests/images/bench.drawOverwrite.bmOverwrite.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawOverwrite.bmOverwrite.png and /dev/null differ
diff --git a/tests/images/bench.drawStepper.bmNormal.png b/tests/images/bench.drawStepper.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawStepper.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawUberCopy.Smooth.bmNormal.png b/tests/images/bench.drawUberCopy.Smooth.bmNormal.png
deleted file mode 100644
index d1d438a..0000000
Binary files a/tests/images/bench.drawUberCopy.Smooth.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawUberCopy.bmNormal.png b/tests/images/bench.drawUberCopy.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawUberCopy.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawUberInPlace.Smooth.bmNormal.png b/tests/images/bench.drawUberInPlace.Smooth.bmNormal.png
deleted file mode 100644
index d1d438a..0000000
Binary files a/tests/images/bench.drawUberInPlace.Smooth.bmNormal.png and /dev/null differ
diff --git a/tests/images/bench.drawUberInPlace.bmNormal.png b/tests/images/bench.drawUberInPlace.bmNormal.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/bench.drawUberInPlace.bmNormal.png and /dev/null differ
diff --git a/tests/images/blur1.png b/tests/images/blur1.png
deleted file mode 100644
index c129e3b..0000000
Binary files a/tests/images/blur1.png and /dev/null differ
diff --git a/tests/images/centerRotation.png b/tests/images/centerRotation.png
deleted file mode 100644
index c2c921f..0000000
Binary files a/tests/images/centerRotation.png and /dev/null differ
diff --git a/tests/images/centerRotationWhite.png b/tests/images/centerRotationWhite.png
deleted file mode 100644
index 3916d2b..0000000
Binary files a/tests/images/centerRotationWhite.png and /dev/null differ
diff --git a/tests/images/copyDraw.bmp b/tests/images/copyDraw.bmp
deleted file mode 100644
index bed31be..0000000
Binary files a/tests/images/copyDraw.bmp and /dev/null differ
diff --git a/tests/images/draw.master.png b/tests/images/draw.master.png
deleted file mode 100644
index ef62fc5..0000000
Binary files a/tests/images/draw.master.png and /dev/null differ
diff --git a/tests/images/draw.png b/tests/images/draw.png
deleted file mode 100644
index ef62fc5..0000000
Binary files a/tests/images/draw.png and /dev/null differ
diff --git a/tests/images/drawBlend.png b/tests/images/drawBlend.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/drawBlend.png and /dev/null differ
diff --git a/tests/images/drawBlendSmooth.png b/tests/images/drawBlendSmooth.png
deleted file mode 100644
index 54a2280..0000000
Binary files a/tests/images/drawBlendSmooth.png and /dev/null differ
diff --git a/tests/images/drawCopy.png b/tests/images/drawCopy.png
deleted file mode 100644
index ef62fc5..0000000
Binary files a/tests/images/drawCopy.png and /dev/null differ
diff --git a/tests/images/drawOverwrite.png b/tests/images/drawOverwrite.png
deleted file mode 100644
index ec3debd..0000000
Binary files a/tests/images/drawOverwrite.png and /dev/null differ
diff --git a/tests/images/drawOverwriteRot.png b/tests/images/drawOverwriteRot.png
deleted file mode 100644
index 7e06202..0000000
Binary files a/tests/images/drawOverwriteRot.png and /dev/null differ
diff --git a/tests/images/drawSmooth.png b/tests/images/drawSmooth.png
deleted file mode 100644
index bef6ff3..0000000
Binary files a/tests/images/drawSmooth.png and /dev/null differ
diff --git a/tests/images/inplaceDraw.bmp b/tests/images/inplaceDraw.bmp
deleted file mode 100644
index f5ff7a7..0000000
Binary files a/tests/images/inplaceDraw.bmp and /dev/null differ
diff --git a/tests/images/pathBlackRectangle.png b/tests/images/paths/pathBlackRectangle.png
similarity index 100%
rename from tests/images/pathBlackRectangle.png
rename to tests/images/paths/pathBlackRectangle.png
diff --git a/tests/images/pathBottomArc.png b/tests/images/paths/pathBottomArc.png
similarity index 100%
rename from tests/images/pathBottomArc.png
rename to tests/images/paths/pathBottomArc.png
diff --git a/tests/images/pathCornerArc.png b/tests/images/paths/pathCornerArc.png
similarity index 100%
rename from tests/images/pathCornerArc.png
rename to tests/images/paths/pathCornerArc.png
diff --git a/tests/images/pathHeart.png b/tests/images/paths/pathHeart.png
similarity index 100%
rename from tests/images/pathHeart.png
rename to tests/images/paths/pathHeart.png
diff --git a/tests/images/pathInvertedCornerArc.png b/tests/images/paths/pathInvertedCornerArc.png
similarity index 100%
rename from tests/images/pathInvertedCornerArc.png
rename to tests/images/paths/pathInvertedCornerArc.png
diff --git a/tests/images/pathRedRectangle.png b/tests/images/paths/pathRedRectangle.png
similarity index 100%
rename from tests/images/pathRedRectangle.png
rename to tests/images/paths/pathRedRectangle.png
diff --git a/tests/images/pathRotatedArc.png b/tests/images/paths/pathRotatedArc.png
similarity index 100%
rename from tests/images/pathRotatedArc.png
rename to tests/images/paths/pathRotatedArc.png
diff --git a/tests/images/pathRoundRect.png b/tests/images/paths/pathRoundRect.png
similarity index 100%
rename from tests/images/pathRoundRect.png
rename to tests/images/paths/pathRoundRect.png
diff --git a/tests/images/pathStroke1.png b/tests/images/paths/pathStroke1.png
similarity index 100%
rename from tests/images/pathStroke1.png
rename to tests/images/paths/pathStroke1.png
diff --git a/tests/images/pathStroke2.png b/tests/images/paths/pathStroke2.png
similarity index 100%
rename from tests/images/pathStroke2.png
rename to tests/images/paths/pathStroke2.png
diff --git a/tests/images/pathStroke3.png b/tests/images/paths/pathStroke3.png
similarity index 100%
rename from tests/images/pathStroke3.png
rename to tests/images/paths/pathStroke3.png
diff --git a/tests/images/pathYellowRectangle.png b/tests/images/paths/pathYellowRectangle.png
similarity index 100%
rename from tests/images/pathYellowRectangle.png
rename to tests/images/paths/pathYellowRectangle.png
diff --git a/tests/images/shadow1.png b/tests/images/shadow1.png
deleted file mode 100644
index 3ae66d5..0000000
Binary files a/tests/images/shadow1.png and /dev/null differ
diff --git a/tests/images/spread1.png b/tests/images/spread1.png
deleted file mode 100644
index 3522111..0000000
Binary files a/tests/images/spread1.png and /dev/null differ
diff --git a/tests/images/transCompose.c.png b/tests/images/transCompose.c.png
deleted file mode 100644
index c2c921f..0000000
Binary files a/tests/images/transCompose.c.png and /dev/null differ
diff --git a/tests/images/transCompose.png b/tests/images/transCompose.png
deleted file mode 100644
index 39553df..0000000
Binary files a/tests/images/transCompose.png and /dev/null differ
diff --git a/tests/test_paths.nim b/tests/test_paths.nim
index 2788a2c..2eeef0e 100644
--- a/tests/test_paths.nim
+++ b/tests/test_paths.nim
@@ -40,14 +40,14 @@ block:
   let pathStr = "M 10 10 L 90 90"
   let color = rgba(255, 0, 0, 255)
   image.strokePath(pathStr, color, 10)
-  image.writeFile("tests/images/pathStroke1.png")
+  image.writeFile("tests/images/paths/pathStroke1.png")
 
 block:
   let image = newImage(100, 100)
   let pathStr = "M 10 10 L 50 60 90 90"
   let color = rgba(255, 0, 0, 255)
   image.strokePath(pathStr, color, 10)
-  image.writeFile("tests/images/pathStroke2.png")
+  image.writeFile("tests/images/paths/pathStroke2.png")
 
 block:
   let image = newImage(100, 100)
@@ -56,14 +56,14 @@ block:
     rgba(255, 255, 0, 255),
     strokeWidth = 10
   )
-  image.writeFile("tests/images/pathStroke3.png")
+  image.writeFile("tests/images/paths/pathStroke3.png")
 
 block:
   let image = newImage(100, 100)
   let pathStr = "M 10 10 H 90 V 90 H 10 L 10 10"
   let color = rgba(0, 0, 0, 255)
   image.fillPath(pathStr, color)
-  image.writeFile("tests/images/pathBlackRectangle.png")
+  image.writeFile("tests/images/paths/pathBlackRectangle.png")
 
 block:
   let image = newImage(100, 100)
@@ -71,7 +71,7 @@ block:
     "M 10 10 H 90 V 90 H 10 L 10 10",
     rgba(255, 255, 0, 255)
   )
-  image.writeFile("tests/images/pathYellowRectangle.png")
+  image.writeFile("tests/images/paths/pathYellowRectangle.png")
 
 block:
   let image = newImage(100, 100)
@@ -85,7 +85,7 @@ block:
     path,
     rgba(255, 0, 0, 255)
   )
-  image.writeFile("tests/images/pathRedRectangle.png")
+  image.writeFile("tests/images/paths/pathRedRectangle.png")
 
 block:
   let image = newImage(100, 100)
@@ -93,7 +93,7 @@ block:
     "M30 60 A 20 20 0 0 0 90 60 L 30 60",
     parseHtmlColor("#FC427B").rgba
   )
-  image.writeFile("tests/images/pathBottomArc.png")
+  image.writeFile("tests/images/paths/pathBottomArc.png")
 
 block:
   let image = newImage(100, 100)
@@ -107,7 +107,7 @@ block:
     """,
     parseHtmlColor("#FC427B").rgba
   )
-  image.writeFile("tests/images/pathHeart.png")
+  image.writeFile("tests/images/paths/pathHeart.png")
 
 block:
   let image = newImage(100, 100)
@@ -115,7 +115,7 @@ block:
     "M 20 50 A 20 10 45 1 1 80 50 L 20 50",
     parseHtmlColor("#FC427B").rgba
   )
-  image.writeFile("tests/images/pathRotatedArc.png")
+  image.writeFile("tests/images/paths/pathRotatedArc.png")
 
 block:
   let image = newImage(100, 100)
@@ -123,7 +123,7 @@ block:
     "M 0 50 A 50 50 0 0 0 50 0 L 50 50 L 0 50",
     parseHtmlColor("#FC427B").rgba
   )
-  image.writeFile("tests/images/pathInvertedCornerArc.png")
+  image.writeFile("tests/images/paths/pathInvertedCornerArc.png")
 
 block:
   let image = newImage(100, 100)
@@ -131,7 +131,7 @@ block:
     "M 0 50 A 50 50 0 0 1 50 0 L 50 50 L 0 50",
     parseHtmlColor("#FC427B").rgba
   )
-  image.writeFile("tests/images/pathCornerArc.png")
+  image.writeFile("tests/images/paths/pathCornerArc.png")
 
 block:
   let image = newImage(100, 100)
@@ -151,4 +151,4 @@ block:
     path,
     rgba(255, 0, 0, 255)
   )
-  image.writeFile("tests/images/pathRoundRect.png")
+  image.writeFile("tests/images/paths/pathRoundRect.png")