diff --git a/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj b/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
index db53cdb0d..d106c6d94 100644
--- a/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
+++ b/src/ImageProcessor.UnitTests/ImageProcessor.UnitTests.csproj
@@ -74,79 +74,69 @@
-
-
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
+
+
PreserveNewest
-
-
- PreserveNewest
-
-
- Images\srgb.jpg
- PreserveNewest
-
-
- Images\srgb.png
+
+
+
+
PreserveNewest
-
-
- Images\text.png
+
+
PreserveNewest
-
-
- Images\udendørs.jpg
+
+
PreserveNewest
-
+
-
diff --git a/src/ImageProcessor.UnitTests/Images/cmyk.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/color-modes/cmyk.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/cmyk.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/color-modes/cmyk.jpg.REMOVED.git-id
diff --git a/src/Images/srgb.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/color-modes/srgb.jpg.REMOVED.git-id
similarity index 100%
rename from src/Images/srgb.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/color-modes/srgb.jpg.REMOVED.git-id
diff --git a/src/Images/srgb.png.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/color-modes/srgb.png.REMOVED.git-id
similarity index 100%
rename from src/Images/srgb.png.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/color-modes/srgb.png.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/hi-color.png b/src/ImageProcessor.UnitTests/Images/color-tests/hi-color.png
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/hi-color.png
rename to src/ImageProcessor.UnitTests/Images/color-tests/hi-color.png
diff --git a/src/ImageProcessor.UnitTests/Images/hi-contrast.jpg b/src/ImageProcessor.UnitTests/Images/color-tests/hi-contrast.jpg
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/hi-contrast.jpg
rename to src/ImageProcessor.UnitTests/Images/color-tests/hi-contrast.jpg
diff --git a/src/ImageProcessor.UnitTests/Images/hi-saturation.jpg b/src/ImageProcessor.UnitTests/Images/color-tests/hi-saturation.jpg
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/hi-saturation.jpg
rename to src/ImageProcessor.UnitTests/Images/color-tests/hi-saturation.jpg
diff --git a/src/ImageProcessor.UnitTests/Images/autorotate.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/exif/autorotate.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/autorotate.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/exif/autorotate.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/exif-Tulips.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/exif/exif-Tulips.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/exif-Tulips.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/exif/exif-Tulips.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/exif-rocks.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/exif/exif-rocks.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/exif-rocks.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/exif/exif-rocks.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/cmyk-profile-euroscale.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/icc-profiles/cmyk-profile-euroscale.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/cmyk-profile-euroscale.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/icc-profiles/cmyk-profile-euroscale.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/profile-adobe-rgb.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/icc-profiles/profile-adobe-rgb.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/profile-adobe-rgb.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/icc-profiles/profile-adobe-rgb.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/profile-srgb.jpg.REMOVED.git-id b/src/ImageProcessor.UnitTests/Images/icc-profiles/profile-srgb.jpg.REMOVED.git-id
similarity index 100%
rename from src/ImageProcessor.UnitTests/Images/profile-srgb.jpg.REMOVED.git-id
rename to src/ImageProcessor.UnitTests/Images/icc-profiles/profile-srgb.jpg.REMOVED.git-id
diff --git a/src/ImageProcessor.UnitTests/Images/text-over-transparent.png b/src/ImageProcessor.UnitTests/Images/text-over-transparent.png
deleted file mode 100644
index 1ae73c91f..000000000
--- a/src/ImageProcessor.UnitTests/Images/text-over-transparent.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba300af935752628b37a7f892369e7229f4f6ae701522cdedeefcf5c2b251afa
-size 7680
diff --git a/src/Images/text.png b/src/ImageProcessor.UnitTests/Images/text.png
similarity index 100%
rename from src/Images/text.png
rename to src/ImageProcessor.UnitTests/Images/text.png
diff --git a/src/ImageProcessor.UnitTests/Images/udendørs.jpg b/src/ImageProcessor.UnitTests/Images/udendørs.jpg
deleted file mode 100644
index 84fb0cc3a..000000000
--- a/src/ImageProcessor.UnitTests/Images/udendørs.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65434ff6c6d5f502308e627fcfbe1d26402b83fb5efba15749ffbb5e8795995e
-size 55987
diff --git a/src/Images/1182076_e8c402e938_z.jpg b/src/Images/1182076_e8c402e938_z.jpg
deleted file mode 100644
index c9728d247..000000000
--- a/src/Images/1182076_e8c402e938_z.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a072091b3310d81e941600b0477a7375f982a59ee09bb98b220235dcb4aeab50
-size 39610
diff --git a/src/Images/Chrysanthemum.jpg.REMOVED.git-id b/src/Images/Chrysanthemum.jpg.REMOVED.git-id
deleted file mode 100644
index da95f0ea7..000000000
--- a/src/Images/Chrysanthemum.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-bad2ae3a7db99a9abccc2b703c3142f1e430fc4a
\ No newline at end of file
diff --git a/src/Images/Desert.jpg.REMOVED.git-id b/src/Images/Desert.jpg.REMOVED.git-id
deleted file mode 100644
index 535ec461a..000000000
--- a/src/Images/Desert.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d9bca17f9d7ceb3d4f36a4261f50d154c0d9f999
\ No newline at end of file
diff --git a/src/Images/Hydrangeas.jpg.REMOVED.git-id b/src/Images/Hydrangeas.jpg.REMOVED.git-id
deleted file mode 100644
index 44ccebdb7..000000000
--- a/src/Images/Hydrangeas.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-910f0327a3ac1c1519e6803e17b47884826936c5
\ No newline at end of file
diff --git a/src/Images/Jellyfish.jpg.REMOVED.git-id b/src/Images/Jellyfish.jpg.REMOVED.git-id
deleted file mode 100644
index 0737ebc64..000000000
--- a/src/Images/Jellyfish.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c477d7ac41218fa01bbd43bc92fa597070d924b8
\ No newline at end of file
diff --git a/src/Images/Koala.jpg.REMOVED.git-id b/src/Images/Koala.jpg.REMOVED.git-id
deleted file mode 100644
index 8aee95fdb..000000000
--- a/src/Images/Koala.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-2c4c24947ae8e71b9eddc2142561efb88ddf217f
\ No newline at end of file
diff --git a/src/Images/Lighthouse.jpg.REMOVED.git-id b/src/Images/Lighthouse.jpg.REMOVED.git-id
deleted file mode 100644
index 5d64e19a0..000000000
--- a/src/Images/Lighthouse.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8e623519c033c24c9d345741f35360b9c2c503b1
\ No newline at end of file
diff --git a/src/Images/Penguins-200.jpg b/src/Images/Penguins-200.jpg
deleted file mode 100644
index 11fd7f00b..000000000
--- a/src/Images/Penguins-200.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb48ce284fa57595265eacde09c948088148bb552ae177c887198b3163be4c1b
-size 9721
diff --git a/src/Images/Penguins-8.png.REMOVED.git-id b/src/Images/Penguins-8.png.REMOVED.git-id
deleted file mode 100644
index 912fc9848..000000000
--- a/src/Images/Penguins-8.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-1672192a14349a4c93fe9ae885d57a3f34e6cc7c
\ No newline at end of file
diff --git a/src/Images/Penguins.bmp.REMOVED.git-id b/src/Images/Penguins.bmp.REMOVED.git-id
deleted file mode 100644
index 96a6235da..000000000
--- a/src/Images/Penguins.bmp.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-b5d0105ca1e16253a3659228c9d5c0fb1382d30c
\ No newline at end of file
diff --git a/src/Images/Penguins.gif.REMOVED.git-id b/src/Images/Penguins.gif.REMOVED.git-id
deleted file mode 100644
index bc27f2f48..000000000
--- a/src/Images/Penguins.gif.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-59484dab746366e19b19ff2aee9780df4d070ad5
\ No newline at end of file
diff --git a/src/Images/Penguins.jpg.REMOVED.git-id b/src/Images/Penguins.jpg.REMOVED.git-id
deleted file mode 100644
index ff0e7a2ab..000000000
--- a/src/Images/Penguins.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-6b9f7cfb8d95c66a9c57ab1e6a050b3c12c7da9f
\ No newline at end of file
diff --git a/src/Images/Penguins.png.REMOVED.git-id b/src/Images/Penguins.png.REMOVED.git-id
deleted file mode 100644
index 9f0108b8c..000000000
--- a/src/Images/Penguins.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-081308e3f81934d507c8c92a69db8faade89807c
\ No newline at end of file
diff --git a/src/Images/Penguins.tif.REMOVED.git-id b/src/Images/Penguins.tif.REMOVED.git-id
deleted file mode 100644
index d966dab5e..000000000
--- a/src/Images/Penguins.tif.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-0932521ba288b3dce84f3da76c2463b69499d8be
\ No newline at end of file
diff --git a/src/Images/Tulips.jpg.REMOVED.git-id b/src/Images/Tulips.jpg.REMOVED.git-id
deleted file mode 100644
index d6e811a98..000000000
--- a/src/Images/Tulips.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-93746408976a04b7f82ad5e204a1b60878786ec7
\ No newline at end of file
diff --git a/src/Images/WP_000009.jpg.REMOVED.git-id b/src/Images/WP_000009.jpg.REMOVED.git-id
deleted file mode 100644
index e840e4d0a..000000000
--- a/src/Images/WP_000009.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-eed6aff6c2c04c224332926429091f8c8a87008f
\ No newline at end of file
diff --git a/src/Images/bus.jpg b/src/Images/bus.jpg
deleted file mode 100644
index 4cc055452..000000000
--- a/src/Images/bus.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4164450c3d2fc3acb031adc72905e9006739e7a53545e07f1f48bacd1031c544
-size 39546
diff --git a/src/Images/circle.png b/src/Images/circle.png
deleted file mode 100644
index e1abea9e1..000000000
--- a/src/Images/circle.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6b4c4845389ed9a1e23f1508ba3d5b8144c26929e6045971720d0a9ede78508
-size 9385
diff --git a/src/Images/cmyk.jpg.REMOVED.git-id b/src/Images/cmyk.jpg.REMOVED.git-id
deleted file mode 100644
index 3ab097adf..000000000
--- a/src/Images/cmyk.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c0a6bbd8ae998f8d786ed64b9870deaad90b41cc
\ No newline at end of file
diff --git a/src/Images/cmyk.png.REMOVED.git-id b/src/Images/cmyk.png.REMOVED.git-id
deleted file mode 100644
index d86ab294d..000000000
--- a/src/Images/cmyk.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7c92aa5bc23660a76c8dca5c88b0c376ced36a29
\ No newline at end of file
diff --git a/src/Images/color-vision-test.gif.REMOVED.git-id b/src/Images/color-vision-test.gif.REMOVED.git-id
deleted file mode 100644
index 942e89855..000000000
--- a/src/Images/color-vision-test.gif.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-26c156d27d0a091d724d846c6d6508707d2a5806
\ No newline at end of file
diff --git a/src/Images/emma.jpg b/src/Images/emma.jpg
deleted file mode 100644
index 392e8396f..000000000
--- a/src/Images/emma.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2277a8f06e65bc8c848742bf63dd0b0bbcd9a38882e4763436677159b72ce002
-size 43105
diff --git a/src/Images/falahill_design__160p.jpg b/src/Images/falahill_design__160p.jpg
deleted file mode 100644
index 54f3efa48..000000000
--- a/src/Images/falahill_design__160p.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edcf78a08c13ee36357c69c83840853f004361575d04e0b2979a5b8e9aa2ea2c
-size 8363
diff --git a/src/Images/fid11246.jpg b/src/Images/fid11246.jpg
deleted file mode 100644
index be3e0b761..000000000
--- a/src/Images/fid11246.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3adc272a933135a6d30a429e5f38efdd735632741caa2830821dd6971c7fff0
-size 60762
diff --git a/src/Images/fid9141.jpg.REMOVED.git-id b/src/Images/fid9141.jpg.REMOVED.git-id
deleted file mode 100644
index e4b1e2f5c..000000000
--- a/src/Images/fid9141.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-abc6e72719427d2fb0dc71acb9f7b145965117f5
\ No newline at end of file
diff --git a/src/Images/header_1.jpg b/src/Images/header_1.jpg
deleted file mode 100644
index 23bdba718..000000000
--- a/src/Images/header_1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12d8e37ce3782745630f7b962e977c1304976b46e44f1695640c7bb95f02f169
-size 26912
diff --git a/src/Images/jrt.jpg.REMOVED.git-id b/src/Images/jrt.jpg.REMOVED.git-id
deleted file mode 100644
index 99e4d4fb2..000000000
--- a/src/Images/jrt.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7ef87feb25b9803c14c1ee8095f8e416caed3622
\ No newline at end of file
diff --git a/src/Images/lomo.jpg b/src/Images/lomo.jpg
deleted file mode 100644
index ace7606f6..000000000
--- a/src/Images/lomo.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b411d03fb6cb9129a7e41734ae3d4de45b533ec337129595db322c036a7b2086
-size 59083
diff --git a/src/Images/meter.gif b/src/Images/meter.gif
deleted file mode 100644
index 1e0ea424c..000000000
--- a/src/Images/meter.gif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33e11cbcf33110fb7797db2b9d8d0e83f19f7da45425ecec7d9198d84507e2bd
-size 43562
diff --git a/src/Images/negative.png b/src/Images/negative.png
deleted file mode 100644
index 95c921a96..000000000
--- a/src/Images/negative.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9653956d765b5d55050506ee95f00f3af9d28181c91ab5dfcd7c8978106432e
-size 4551
diff --git a/src/Images/negative2.png.REMOVED.git-id b/src/Images/negative2.png.REMOVED.git-id
deleted file mode 100644
index 44dfca16c..000000000
--- a/src/Images/negative2.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-311373d51648f330d7f947cf5575f4b8921c8e59
\ No newline at end of file
diff --git a/src/Images/rocks.jpg.REMOVED.git-id b/src/Images/rocks.jpg.REMOVED.git-id
deleted file mode 100644
index 6bdccbf17..000000000
--- a/src/Images/rocks.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-44b0fc1f6eeb92f4baa4a28b70526da1bd6b3bd3
\ No newline at end of file
diff --git a/src/Images/rotate.jpg.REMOVED.git-id b/src/Images/rotate.jpg.REMOVED.git-id
deleted file mode 100644
index 0e2fda8fa..000000000
--- a/src/Images/rotate.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-da01ec73151951f39c5bd5069b0e331a5b998476
\ No newline at end of file
diff --git a/src/Images/sample1.jpg b/src/Images/sample1.jpg
deleted file mode 100644
index 3e7dbef10..000000000
--- a/src/Images/sample1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e19221eef370592f51368e5c17315b27557b465f484cf80c9a0995217cdf6658
-size 36491
diff --git a/src/Images/thor.jpg.REMOVED.git-id b/src/Images/thor.jpg.REMOVED.git-id
deleted file mode 100644
index a0cee6eff..000000000
--- a/src/Images/thor.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4accd7c30d40a18a009ce6524febd7c78ee15ef4
\ No newline at end of file
diff --git a/src/Images/udendørs-374.jpg b/src/Images/udendørs-374.jpg
deleted file mode 100644
index b505e052f..000000000
--- a/src/Images/udendørs-374.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84afbee0060a384dbfdea75b0e932775db654a3d4fffaebeb26a52f0ec398e11
-size 19918
diff --git a/src/Images/udendørs.jpg.REMOVED.git-id b/src/Images/udendørs.jpg.REMOVED.git-id
deleted file mode 100644
index 4ece57ea3..000000000
--- a/src/Images/udendørs.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-65c397b361b7325abc1aefbd993198702e296681
\ No newline at end of file
diff --git a/src/Images/war_horse_quad.jpg.REMOVED.git-id b/src/Images/war_horse_quad.jpg.REMOVED.git-id
deleted file mode 100644
index cefb0bb49..000000000
--- a/src/Images/war_horse_quad.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-56245ff8ec34756b710bdc81cc459e4097642955
\ No newline at end of file