diff --git a/data/testsuite/Bradley1.png b/data/testsuite/epic/Bradley1.png
similarity index 100%
rename from data/testsuite/Bradley1.png
rename to data/testsuite/epic/Bradley1.png
diff --git a/data/testsuite/Gradient.png b/data/testsuite/epic/Gradient.png
similarity index 100%
rename from data/testsuite/Gradient.png
rename to data/testsuite/epic/Gradient.png
diff --git a/data/testsuite/MoreRocks.png b/data/testsuite/epic/MoreRocks.png
similarity index 100%
rename from data/testsuite/MoreRocks.png
rename to data/testsuite/epic/MoreRocks.png
diff --git a/data/testsuite/Rainbow.png b/data/testsuite/epic/Rainbow.png
similarity index 100%
rename from data/testsuite/Rainbow.png
rename to data/testsuite/epic/Rainbow.png
diff --git a/data/testsuite/Text.png b/data/testsuite/epic/Text.png
similarity index 100%
rename from data/testsuite/Text.png
rename to data/testsuite/epic/Text.png
diff --git a/data/testsuite/Wall.png b/data/testsuite/epic/Wall.png
similarity index 100%
rename from data/testsuite/Wall.png
rename to data/testsuite/epic/Wall.png
diff --git a/data/testsuite/t.2d.pn02.png b/data/testsuite/farbrausch/t.2d.pn02.png
similarity index 100%
rename from data/testsuite/t.2d.pn02.png
rename to data/testsuite/farbrausch/t.2d.pn02.png
diff --git a/data/testsuite/t.aircondition.01.png b/data/testsuite/farbrausch/t.aircondition.01.png
similarity index 100%
rename from data/testsuite/t.aircondition.01.png
rename to data/testsuite/farbrausch/t.aircondition.01.png
diff --git a/data/testsuite/t.bricks.02.png b/data/testsuite/farbrausch/t.bricks.02.png
similarity index 100%
rename from data/testsuite/t.bricks.02.png
rename to data/testsuite/farbrausch/t.bricks.02.png
diff --git a/data/testsuite/t.bricks.05.png b/data/testsuite/farbrausch/t.bricks.05.png
similarity index 100%
rename from data/testsuite/t.bricks.05.png
rename to data/testsuite/farbrausch/t.bricks.05.png
diff --git a/data/testsuite/t.concrete.cracked.01.png b/data/testsuite/farbrausch/t.concrete.cracked.01.png
similarity index 100%
rename from data/testsuite/t.concrete.cracked.01.png
rename to data/testsuite/farbrausch/t.concrete.cracked.01.png
diff --git a/data/testsuite/t.envi.colored02.png b/data/testsuite/farbrausch/t.envi.colored02.png
similarity index 100%
rename from data/testsuite/t.envi.colored02.png
rename to data/testsuite/farbrausch/t.envi.colored02.png
diff --git a/data/testsuite/t.envi.colored03.png b/data/testsuite/farbrausch/t.envi.colored03.png
similarity index 100%
rename from data/testsuite/t.envi.colored03.png
rename to data/testsuite/farbrausch/t.envi.colored03.png
diff --git a/data/testsuite/t.font.01.png b/data/testsuite/farbrausch/t.font.01.png
similarity index 100%
rename from data/testsuite/t.font.01.png
rename to data/testsuite/farbrausch/t.font.01.png
diff --git a/data/testsuite/t.sewers.01.png b/data/testsuite/farbrausch/t.sewers.01.png
similarity index 100%
rename from data/testsuite/t.sewers.01.png
rename to data/testsuite/farbrausch/t.sewers.01.png
diff --git a/data/testsuite/t.train.03.png b/data/testsuite/farbrausch/t.train.03.png
similarity index 100%
rename from data/testsuite/t.train.03.png
rename to data/testsuite/farbrausch/t.train.03.png
diff --git a/data/testsuite/t.yello.01.png b/data/testsuite/farbrausch/t.yello.01.png
similarity index 100%
rename from data/testsuite/t.yello.01.png
rename to data/testsuite/farbrausch/t.yello.01.png
diff --git a/data/testsuite/kodim01.png b/data/testsuite/kodak/kodim01.png
similarity index 100%
rename from data/testsuite/kodim01.png
rename to data/testsuite/kodak/kodim01.png
diff --git a/data/testsuite/kodim02.png b/data/testsuite/kodak/kodim02.png
similarity index 100%
rename from data/testsuite/kodim02.png
rename to data/testsuite/kodak/kodim02.png
diff --git a/data/testsuite/kodim03.png b/data/testsuite/kodak/kodim03.png
similarity index 100%
rename from data/testsuite/kodim03.png
rename to data/testsuite/kodak/kodim03.png
diff --git a/data/testsuite/kodim04.png b/data/testsuite/kodak/kodim04.png
similarity index 100%
rename from data/testsuite/kodim04.png
rename to data/testsuite/kodak/kodim04.png
diff --git a/data/testsuite/kodim05.png b/data/testsuite/kodak/kodim05.png
similarity index 100%
rename from data/testsuite/kodim05.png
rename to data/testsuite/kodak/kodim05.png
diff --git a/data/testsuite/kodim06.png b/data/testsuite/kodak/kodim06.png
similarity index 100%
rename from data/testsuite/kodim06.png
rename to data/testsuite/kodak/kodim06.png
diff --git a/data/testsuite/kodim07.png b/data/testsuite/kodak/kodim07.png
similarity index 100%
rename from data/testsuite/kodim07.png
rename to data/testsuite/kodak/kodim07.png
diff --git a/data/testsuite/kodim08.png b/data/testsuite/kodak/kodim08.png
similarity index 100%
rename from data/testsuite/kodim08.png
rename to data/testsuite/kodak/kodim08.png
diff --git a/data/testsuite/kodim09.png b/data/testsuite/kodak/kodim09.png
similarity index 100%
rename from data/testsuite/kodim09.png
rename to data/testsuite/kodak/kodim09.png
diff --git a/data/testsuite/kodim10.png b/data/testsuite/kodak/kodim10.png
similarity index 100%
rename from data/testsuite/kodim10.png
rename to data/testsuite/kodak/kodim10.png
diff --git a/data/testsuite/kodim11.png b/data/testsuite/kodak/kodim11.png
similarity index 100%
rename from data/testsuite/kodim11.png
rename to data/testsuite/kodak/kodim11.png
diff --git a/data/testsuite/kodim12.png b/data/testsuite/kodak/kodim12.png
similarity index 100%
rename from data/testsuite/kodim12.png
rename to data/testsuite/kodak/kodim12.png
diff --git a/data/testsuite/kodim13.png b/data/testsuite/kodak/kodim13.png
similarity index 100%
rename from data/testsuite/kodim13.png
rename to data/testsuite/kodak/kodim13.png
diff --git a/data/testsuite/kodim14.png b/data/testsuite/kodak/kodim14.png
similarity index 100%
rename from data/testsuite/kodim14.png
rename to data/testsuite/kodak/kodim14.png
diff --git a/data/testsuite/kodim15.png b/data/testsuite/kodak/kodim15.png
similarity index 100%
rename from data/testsuite/kodim15.png
rename to data/testsuite/kodak/kodim15.png
diff --git a/data/testsuite/kodim16.png b/data/testsuite/kodak/kodim16.png
similarity index 100%
rename from data/testsuite/kodim16.png
rename to data/testsuite/kodak/kodim16.png
diff --git a/data/testsuite/kodim17.png b/data/testsuite/kodak/kodim17.png
similarity index 100%
rename from data/testsuite/kodim17.png
rename to data/testsuite/kodak/kodim17.png
diff --git a/data/testsuite/kodim18.png b/data/testsuite/kodak/kodim18.png
similarity index 100%
rename from data/testsuite/kodim18.png
rename to data/testsuite/kodak/kodim18.png
diff --git a/data/testsuite/kodim19.png b/data/testsuite/kodak/kodim19.png
similarity index 100%
rename from data/testsuite/kodim19.png
rename to data/testsuite/kodak/kodim19.png
diff --git a/data/testsuite/kodim20.png b/data/testsuite/kodak/kodim20.png
similarity index 100%
rename from data/testsuite/kodim20.png
rename to data/testsuite/kodak/kodim20.png
diff --git a/data/testsuite/kodim21.png b/data/testsuite/kodak/kodim21.png
similarity index 100%
rename from data/testsuite/kodim21.png
rename to data/testsuite/kodak/kodim21.png
diff --git a/data/testsuite/kodim22.png b/data/testsuite/kodak/kodim22.png
similarity index 100%
rename from data/testsuite/kodim22.png
rename to data/testsuite/kodak/kodim22.png
diff --git a/data/testsuite/kodim23.png b/data/testsuite/kodak/kodim23.png
similarity index 100%
rename from data/testsuite/kodim23.png
rename to data/testsuite/kodak/kodim23.png
diff --git a/data/testsuite/kodim24.png b/data/testsuite/kodak/kodim24.png
similarity index 100%
rename from data/testsuite/kodim24.png
rename to data/testsuite/kodak/kodim24.png
diff --git a/data/testsuite/lugaru-blood.png b/data/testsuite/lugaru/lugaru-blood.png
similarity index 100%
rename from data/testsuite/lugaru-blood.png
rename to data/testsuite/lugaru/lugaru-blood.png
diff --git a/data/testsuite/lugaru-bush.png b/data/testsuite/lugaru/lugaru-bush.png
similarity index 100%
rename from data/testsuite/lugaru-bush.png
rename to data/testsuite/lugaru/lugaru-bush.png
diff --git a/data/testsuite/lugaru-cursor.png b/data/testsuite/lugaru/lugaru-cursor.png
similarity index 100%
rename from data/testsuite/lugaru-cursor.png
rename to data/testsuite/lugaru/lugaru-cursor.png
diff --git a/data/testsuite/lugaru-hawk.png b/data/testsuite/lugaru/lugaru-hawk.png
similarity index 100%
rename from data/testsuite/lugaru-hawk.png
rename to data/testsuite/lugaru/lugaru-hawk.png
diff --git a/data/testsuite/q3-blocks15cgeomtrn.tga b/data/testsuite/quake3/q3-blocks15cgeomtrn.tga
similarity index 100%
rename from data/testsuite/q3-blocks15cgeomtrn.tga
rename to data/testsuite/quake3/q3-blocks15cgeomtrn.tga
diff --git a/data/testsuite/q3-blocks17bloody.tga b/data/testsuite/quake3/q3-blocks17bloody.tga
similarity index 100%
rename from data/testsuite/q3-blocks17bloody.tga
rename to data/testsuite/quake3/q3-blocks17bloody.tga
diff --git a/data/testsuite/q3-dark_tin2.tga b/data/testsuite/quake3/q3-dark_tin2.tga
similarity index 100%
rename from data/testsuite/q3-dark_tin2.tga
rename to data/testsuite/quake3/q3-dark_tin2.tga
diff --git a/data/testsuite/q3-fan.tga b/data/testsuite/quake3/q3-fan.tga
similarity index 100%
rename from data/testsuite/q3-fan.tga
rename to data/testsuite/quake3/q3-fan.tga
diff --git a/data/testsuite/q3-fan_grate.tga b/data/testsuite/quake3/q3-fan_grate.tga
similarity index 100%
rename from data/testsuite/q3-fan_grate.tga
rename to data/testsuite/quake3/q3-fan_grate.tga
diff --git a/data/testsuite/q3-metal2_2.tga b/data/testsuite/quake3/q3-metal2_2.tga
similarity index 100%
rename from data/testsuite/q3-metal2_2.tga
rename to data/testsuite/quake3/q3-metal2_2.tga
diff --git a/data/testsuite/q3-panel_glo.tga b/data/testsuite/quake3/q3-panel_glo.tga
similarity index 100%
rename from data/testsuite/q3-panel_glo.tga
rename to data/testsuite/quake3/q3-panel_glo.tga
diff --git a/data/testsuite/q3-proto_fence.tga b/data/testsuite/quake3/q3-proto_fence.tga
similarity index 100%
rename from data/testsuite/q3-proto_fence.tga
rename to data/testsuite/quake3/q3-proto_fence.tga
diff --git a/data/testsuite/q3-wires02.tga b/data/testsuite/quake3/q3-wires02.tga
similarity index 100%
rename from data/testsuite/q3-wires02.tga
rename to data/testsuite/quake3/q3-wires02.tga
diff --git a/data/testsuite/clegg.png b/data/testsuite/waterloo/clegg.png
similarity index 100%
rename from data/testsuite/clegg.png
rename to data/testsuite/waterloo/clegg.png
diff --git a/data/testsuite/frymire.png b/data/testsuite/waterloo/frymire.png
similarity index 100%
rename from data/testsuite/frymire.png
rename to data/testsuite/waterloo/frymire.png
diff --git a/data/testsuite/lena.png b/data/testsuite/waterloo/lena.png
similarity index 100%
rename from data/testsuite/lena.png
rename to data/testsuite/waterloo/lena.png
diff --git a/data/testsuite/monarch.png b/data/testsuite/waterloo/monarch.png
similarity index 100%
rename from data/testsuite/monarch.png
rename to data/testsuite/waterloo/monarch.png
diff --git a/data/testsuite/peppers.png b/data/testsuite/waterloo/peppers.png
similarity index 100%
rename from data/testsuite/peppers.png
rename to data/testsuite/waterloo/peppers.png
diff --git a/data/testsuite/sail.png b/data/testsuite/waterloo/sail.png
similarity index 100%
rename from data/testsuite/sail.png
rename to data/testsuite/waterloo/sail.png
diff --git a/data/testsuite/serrano.png b/data/testsuite/waterloo/serrano.png
similarity index 100%
rename from data/testsuite/serrano.png
rename to data/testsuite/waterloo/serrano.png
diff --git a/data/testsuite/tulips.png b/data/testsuite/waterloo/tulips.png
similarity index 100%
rename from data/testsuite/tulips.png
rename to data/testsuite/waterloo/tulips.png