diff --git a/CMakeLists.txt b/CMakeLists.txt
index 270cc3a66..0ed091cb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/objects/widget.c
     ${SOURCE_DIR}/xwindow.c
-    ${SOURCE_DIR}/image.c
+    ${SOURCE_DIR}/objects/image.c
     ${SOURCE_DIR}/draw.c
     ${SOURCE_DIR}/font.c
     ${SOURCE_DIR}/color.c
diff --git a/draw.h b/draw.h
index af6d1bf9e..6bafb007d 100644
--- a/draw.h
+++ b/draw.h
@@ -27,7 +27,7 @@
 
 #include <xcb/xcb.h>
 
-#include "image.h"
+#include "objects/image.h"
 #include "color.h"
 #include "common/array.h"
 
diff --git a/image.c b/objects/image.c
similarity index 100%
rename from image.c
rename to objects/image.c
diff --git a/image.h b/objects/image.h
similarity index 100%
rename from image.h
rename to objects/image.h