diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc2c614b..4d4b4e1a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/event.c
     ${SOURCE_DIR}/property.c
     ${SOURCE_DIR}/ewmh.c
-    ${SOURCE_DIR}/key.c
+    ${SOURCE_DIR}/objects/key.c
     ${SOURCE_DIR}/keygrabber.c
     ${SOURCE_DIR}/mousegrabber.c
     ${SOURCE_DIR}/banning.c
diff --git a/button.c b/button.c
index 1f58d5a1f..94cf8cf58 100644
--- a/button.c
+++ b/button.c
@@ -21,7 +21,7 @@
 
 #include "button.h"
 #include "luaa.h"
-#include "key.h"
+#include "objects/key.h"
 #include "common/luaobject.h"
 
 /** Create a new mouse button bindings.
diff --git a/event.c b/event.c
index 630fa4807..7603eb5e4 100644
--- a/event.c
+++ b/event.c
@@ -33,7 +33,7 @@
 #include "objects/client.h"
 #include "objects/widget.h"
 #include "titlebar.h"
-#include "key.h"
+#include "objects/key.h"
 #include "keygrabber.h"
 #include "mousegrabber.h"
 #include "luaa.h"
diff --git a/globalconf.h b/globalconf.h
index 80d40bc96..b0448ff90 100644
--- a/globalconf.h
+++ b/globalconf.h
@@ -30,7 +30,7 @@
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_keysyms.h>
 
-#include "key.h"
+#include "objects/key.h"
 #include "color.h"
 #include "font.h"
 #include "common/xembed.h"
diff --git a/keygrabber.c b/keygrabber.c
index 177eef2ec..90b6c3f68 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -23,7 +23,7 @@
 
 #include "globalconf.h"
 #include "keygrabber.h"
-#include "key.h"
+#include "objects/key.h"
 #include "luaa.h"
 #include "common/xutil.h"
 
diff --git a/key.c b/objects/key.c
similarity index 100%
rename from key.c
rename to objects/key.c
diff --git a/key.h b/objects/key.h
similarity index 100%
rename from key.h
rename to objects/key.h