diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d4b4e1a..bec208d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/luaa.c
     ${SOURCE_DIR}/spawn.c
     ${SOURCE_DIR}/mouse.c
-    ${SOURCE_DIR}/button.c
+    ${SOURCE_DIR}/objects/button.c
     ${SOURCE_DIR}/screen.c
     ${SOURCE_DIR}/stack.c
     ${SOURCE_DIR}/selection.c
diff --git a/button.c b/objects/button.c
similarity index 100%
rename from button.c
rename to objects/button.c
diff --git a/button.h b/objects/button.h
similarity index 100%
rename from button.h
rename to objects/button.h
diff --git a/root.c b/root.c
index cf9e8f97..557cdc0d 100644
--- a/root.c
+++ b/root.c
@@ -22,7 +22,7 @@
 #include <xcb/xtest.h>
 
 #include "globalconf.h"
-#include "button.h"
+#include "objects/button.h"
 #include "wibox.h"
 #include "luaa.h"
 #include "window.h"
diff --git a/window.c b/window.c
index 5e9c7346..1d6cc671 100644
--- a/window.c
+++ b/window.c
@@ -1,7 +1,7 @@
 /*
  * window.c - window handling functions
  *
- * Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
+ * Copyright © 2007-2009 Julien Danjou <julien@danjou.info>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include <xcb/xcb_atom.h>
 
 #include "window.h"
-#include "button.h"
+#include "objects/button.h"
 #include "common/atoms.h"
 
 /** Mask shorthands */