Move image class into image directory.

75 files changed, 128 insertions, 88 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f3cd1dff..7d7c154f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -647,8 +647,8 @@ SET(SRCS
     resources/fboinfo.h
     resources/frame.h
     resources/horseinfo.h
-    resources/image.cpp
-    resources/image.h
+    resources/image/image.cpp
+    resources/image/image.h
     resources/imagehelper.cpp
     resources/imagehelper.h
     resources/imagerect.h
@@ -1428,8 +1428,8 @@ SET(DYE_CMD_SRCS
     resources/effectdescription.h
     resources/emoteinfo.h
     resources/emotesprite.h
-    resources/image.cpp
-    resources/image.h
+    resources/image/image.cpp
+    resources/image/image.h
     resources/imagehelper.cpp
     resources/imagehelper.h
     resources/imagerect.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 17ee559b0..048c064ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -363,8 +363,8 @@ SRC += events/actionevent.h \
 	      resources/dye/dyepalette.h \
 	      resources/fboinfo.h \
 	      resources/frame.h \
-	      resources/image.cpp \
-	      resources/image.h \
+	      resources/image/image.cpp \
+	      resources/image/image.h \
 	      resources/imagehelper.cpp \
 	      resources/imagehelper.h \
 	      resources/imageset.cpp \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index b7f545918..cec64c269 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -71,7 +71,6 @@
 #include "resources/emoteinfo.h"
 #include "resources/emotesprite.h"
 #include "resources/horseinfo.h"
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
 #include "resources/db/avatardb.h"
@@ -86,6 +85,8 @@
 #include "resources/db/petdb.h"
 #include "resources/db/skillunitdb.h"
 
+#include "resources/image/image.h"
+
 #include "resources/map/map.h"
 
 #include "resources/sprite/animatedsprite.h"
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 79d3c14ce..5f90c978a 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -33,10 +33,10 @@
 
 #include "render/surfacegraphics.h"
 
-#include "resources/image.h"
 #if defined(USE_OPENGL) || !defined(USE_SDL2)
 #include "resources/imagehelper.h"
 #endif  // USE_OPENGL
+#include "resources/image/image.h"
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
diff --git a/src/dragdrop.h b/src/dragdrop.h
index 71656ba2f..75d08d15f 100644
--- a/src/dragdrop.h
+++ b/src/dragdrop.h
@@ -33,7 +33,7 @@
 #include "gui/widgets/skilldata.h"
 #include "gui/widgets/skillinfo.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "localconsts.h"
 
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index 9763f603b..fb8146566 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -24,9 +24,10 @@
 #include "maingui.h"
 #include "sdlshared.h"
 
-#include "resources/image.h"
 #include "resources/imagewriter.h"
 
+#include "resources/image/image.h"
+
 #ifdef USE_SDL2
 #include "resources/surfaceimagehelper.h"
 #endif  // USE_SDL2
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index ffd1db347..7bc0c5357 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -70,9 +70,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/files.h"
 #include "utils/paths.h"
diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp
index 63c70acdb..06e649bf4 100644
--- a/src/gui/fonts/textchunk.cpp
+++ b/src/gui/fonts/textchunk.cpp
@@ -27,9 +27,10 @@
 
 #include "gui/fonts/font.h"
 
-#include "resources/image.h"
 #include "resources/surfaceimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a4a6a145d..a4b704079 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -76,7 +76,7 @@
 #ifndef DYECMD
 #include "dragdrop.h"
 #else
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif
 #include "settings.h"
 
diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index 161ab6cd9..85544ca6d 100644
--- a/src/gui/models/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -21,10 +21,10 @@
 #ifndef GUI_MODELS_EXTENDEDLISTMODEL_H
 #define GUI_MODELS_EXTENDEDLISTMODEL_H
 
-#include "resources/image.h"
-
 #include "gui/models/listmodel.h"
 
+#include "resources/image/image.h"
+
 class ExtendedListModel notfinal : public ListModel
 {
     public:
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 25ba7dafe..f96a73493 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -37,9 +37,10 @@
 
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
+#include "resources/image/image.h"
+
 #include "resources/item/item.h"
 
 #include "resources/loaders/imageloader.h"
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index ad11640af..971b41295 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -28,9 +28,10 @@
 
 #include "enums/resources/imageposition.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index f3100a9cb..8381601fb 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -32,11 +32,12 @@
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 #include "resources/loaders/subimageloader.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index bd71e1ff9..9919a10d3 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -43,7 +43,7 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/map/map.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 007f2ce2c..5edc9384e 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -39,14 +39,14 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
 
 #include "resources/db/itemdb.h"
 
-#include "resources/loaders/imageloader.h"
+#include "resources/image/image.h"
 
+#include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 3fe272a2e..9ed506b9a 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -67,10 +67,11 @@
 
 #include "settings.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "gui/gui.h"
 #include "gui/skin.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index b0679e1d8..fce3560a6 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -74,9 +74,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int CheckBox::instances = 0;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6c939db5c..d1a7822a1 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -31,10 +31,11 @@
 
 #include "render/opengl/opengldebug.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/wallpaper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/rescaledloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 0b004cdad..2fbb1e6bc 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -37,10 +37,11 @@
 #include "input/inputactionoperators.h"
 
 #include "resources/emotesprite.h"
-#include "resources/image.h"
 
 #include "resources/db/emotedb.h"
 
+#include "resources/image/image.h"
+
 #include "resources/sprite/animatedsprite.h"
 
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 3b9bdeaf8..e9f745255 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -26,7 +26,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/gui/widgets/linepart.cpp b/src/gui/widgets/linepart.cpp
index 51cd7f878..0b778cbbb 100644
--- a/src/gui/widgets/linepart.cpp
+++ b/src/gui/widgets/linepart.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/widgets/linepart.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 75d1dc872..560102f5b 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -31,7 +31,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 6cd6b75e0..b3d43a09f 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -74,9 +74,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int RadioButton::instances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index db3de4874..065a72df8 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -77,9 +77,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int ScrollArea::instances = 0;
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index fe720e387..5d083a30f 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -37,7 +37,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/item/shopitem.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index c39cec66e..1d787e096 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/delete2.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index 507942e1b..3b8328474 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -26,7 +26,7 @@
 
 #include "gui/theme.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 9b21c0bab..5d8e47d2c 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -71,9 +71,10 @@
 
 #include "utils/delete2.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "render/graphics.h"
 
 #include "render/vertexes/imagecollection.h"
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index a7568a4ca..2555ca52b 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -75,9 +75,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 9d89dfe45..f4c6f11b6 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -92,9 +92,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #undef DELETE  // Win32 compatibility hack
 
 #include "debug.h"
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index a1f4c4661..036f17688 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -70,7 +70,7 @@
 #ifndef DYECMD
 #include "dragdrop.h"
 #else
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif
 #include "soundmanager.h"
 
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 7acbad13d..d0d215522 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -34,9 +34,10 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 EmoteWindow *emoteWindow = nullptr;
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index eb075a624..76d029ec1 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -38,9 +38,10 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "resources/db/itemdb.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 1677169e0..3450436ef 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -38,9 +38,10 @@
 
 #include "gui/windows/setupwindow.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/map/map.h"
 #include "resources/map/metatile.h"
 
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index 904fd4ba2..29e2b3cf5 100644
--- a/src/input/touch/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -39,9 +39,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 TouchManager touchManager;
diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp
index 8d53bddce..c7dfa1c7d 100644
--- a/src/particle/imageparticle.cpp
+++ b/src/particle/imageparticle.cpp
@@ -24,7 +24,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "debug.h"
 
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index f7ecccd93..4e7b154c0 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -28,12 +28,12 @@
 #include "particle/particleemitter.h"
 #include "particle/rotationalparticle.h"
 
-#include "resources/image.h"
-
 #include "resources/animation/simpleanimation.h"
 
 #include "resources/dye/dye.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "utils/delete2.h"
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 552831abc..b3fec4142 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -29,11 +29,12 @@
 #include "particle/animationparticle.h"
 #include "particle/rotationalparticle.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
 #include "resources/dye/dye.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 #include "resources/loaders/subimageloader.h"
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 5feaa0d2e..017d02e58 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -37,10 +37,11 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/sdlhelper.h"
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index c8d4a93d4..dac566822 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -33,10 +33,11 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index afebaf1c5..6eb98601a 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -37,10 +37,11 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/sdlhelper.h"
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 751877bfe..22aef9cda 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -30,10 +30,11 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index d4e878479..6d4795e94 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -32,10 +32,11 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 GLuint NullOpenGLGraphics::mTextureBinded = 0;
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 48fe5e2d2..079ea9d31 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -25,10 +25,11 @@
 
 #include "render/opengl/mgl.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/safeopenglimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index babeeb6fd..f00846563 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -75,11 +75,12 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/imagerect.h"
 #include "resources/sdl2imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include "utils/sdlpixel.h"
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 125ba8847..130d34b12 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -32,11 +32,12 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/imagerect.h"
 #include "resources/sdl2softwareimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include "utils/sdlpixel.h"
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 40978f2d6..b8c770bf4 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -34,9 +34,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 #ifndef SDL_BYTEORDER
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index e6fc33298..f499e2c14 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -22,12 +22,12 @@
 
 #include "render/surfacegraphics.h"
 
-#include "resources/image.h"
-
 #ifndef USE_SDL2
 #include "resources/surfaceimagehelper.h"
 #endif  // USE_SDL2
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 SurfaceGraphics::SurfaceGraphics() :
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index f75300367..fe8101eb4 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -25,9 +25,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/rescaledloader.h"
 
 #include "debug.h"
diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h
index 039000393..ae0c0d206 100644
--- a/src/resources/atlas/atlasitem.h
+++ b/src/resources/atlas/atlasitem.h
@@ -23,9 +23,10 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/image.h"
 #include "resources/memorycounter.h"
 
+#include "resources/image/image.h"
+
 #include <string>
 
 struct AtlasItem final : public MemoryCounter
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index 176e2f090..76fca7223 100644
--- a/src/resources/atlas/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -23,7 +23,7 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "utils/stringvector.h"
 
diff --git a/src/resources/image.cpp b/src/resources/image/image.cpp
index 26322aed9..683129e7a 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image/image.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "logger.h"
 
diff --git a/src/resources/image.h b/src/resources/image/image.h
index 39492c360..39492c360 100644
--- a/src/resources/image.h
+++ b/src/resources/image/image.h
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index e74ca3c07..913a861e5 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index d3ab9facc..f2d0d045d 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -22,9 +22,10 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index ad3868cc3..86b0263cb 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -22,9 +22,10 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 95ef6dff7..8909209a4 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -22,7 +22,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/rescaledloader.h"
 
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 1331da245..9b0459e88 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -22,7 +22,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/subimageloader.h"
 
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index a8db6771a..1b271b33f 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -20,13 +20,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/subimagesetloader.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp
index eb7676342..8bc3ce8f4 100644
--- a/src/resources/map/mapitem.cpp
+++ b/src/resources/map/mapitem.cpp
@@ -27,7 +27,7 @@
 
 #include "gui/fonts/font.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index 7ccf26396..ba8f49455 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -37,7 +37,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/map/mapitem.h"
 #include "resources/map/maprowvertexes.h"
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index d8e695b7a..05fee875a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -37,9 +37,10 @@
 #include "resources/map/tileset.h"
 
 #include "resources/beingcommon.h"
-#include "resources/image.h"
 #include "resources/animation/animation.h"
 
+#include "resources/image/image.h"
+
 #ifdef USE_OPENGL
 #include "resources/db/mapdb.h"
 #include "resources/loaders/atlasloader.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 7ce48556d..b29e3b3b9 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,11 +39,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 993d011b7..5fcc35477 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -26,7 +26,7 @@
 #include "logger.h"
 
 #ifdef USE_OPENGL
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif  // USE_OPENGL
 
 #include "resources/imageset.h"
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 8a929f214..60c71d12e 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -36,11 +36,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index 9bd66c3e4..5f8f95e6b 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -27,11 +27,11 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/sdlcheckutils.h"
diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp
index 375f08cc5..3c50531d0 100644
--- a/src/resources/sdl2softwareimagehelper.cpp
+++ b/src/resources/sdl2softwareimagehelper.cpp
@@ -29,7 +29,7 @@
 
 #include "resources/dye/dye.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index d97a51fc6..f8b8fb96d 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -27,11 +27,11 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_gfxBlitFunc.h>
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 8a60de0f3..738f8c31b 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -28,10 +28,11 @@
 
 #include "resources/action.h"
 #include "resources/delayedmanager.h"
-#include "resources/image.h"
 
 #include "resources/animation/animation.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/spritedefloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
index c3fa39fae..21c873f40 100644
--- a/src/resources/sprite/imagesprite.h
+++ b/src/resources/sprite/imagesprite.h
@@ -24,7 +24,7 @@
 
 #include "resources/sprite/sprite.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 class Graphics;
 
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 1fa0eb3ed..29f7fed1e 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -38,7 +38,7 @@
 
 #endif
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 /**
  * A clipped version of a larger image.
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index effba4abd..b8c3bf6ac 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -27,10 +27,10 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 
+#include "resources/image/image.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/sdlcheckutils.h"
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 9c1ee464a..2afee7f43 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -40,7 +40,6 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagewriter.h"
 #include "resources/mstack.h"
 #include "resources/openglimagehelper.h"
@@ -51,6 +50,8 @@
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include <unistd.h>
 
 #ifdef WIN32
diff --git a/src/text.cpp b/src/text.cpp
index 09f30a0e6..66146d911 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -31,9 +31,10 @@
 
 #include "gui/fonts/font.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/textcommand.cpp b/src/textcommand.cpp
index a89b916fe..96b727788 100644
--- a/src/textcommand.cpp
+++ b/src/textcommand.cpp
@@ -26,11 +26,12 @@
 
 #include "gui/theme.h"
 
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
 #include "resources/db/itemdb.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "debug.h"