diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f3738bf50..7efb982392 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,23 +182,20 @@ endif(KWIN_BUILD_TABBOX)
 if(KWIN_BUILD_TILING)
     set(
         kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
-        tile.cpp
-        tilinglayout.cpp
+        tiling/tile.cpp
+        tiling/tiling.cpp
+        tiling/tilinglayout.cpp
         tilinglayoutfactory.cpp
 
         # tiling layouts
         # spiral
-        #tilinglayouts/spiral/spiralfactory.cpp
         tilinglayouts/spiral/spiral.cpp
 
         # columns
-        #tilinglayouts/columns/columnsfactory.cpp
         tilinglayouts/columns/columns.cpp
 
         # floating
         tilinglayouts/floating/floating.cpp
-
-        tiling/tiling.cpp
    )
 endif(KWIN_BUILD_TILING)
 
diff --git a/tile.cpp b/tiling/tile.cpp
similarity index 100%
rename from tile.cpp
rename to tiling/tile.cpp
diff --git a/tile.h b/tiling/tile.h
similarity index 100%
rename from tile.h
rename to tiling/tile.h
diff --git a/tiling/tiling.cpp b/tiling/tiling.cpp
index 39660d9fd4..5fbde974ed 100644
--- a/tiling/tiling.cpp
+++ b/tiling/tiling.cpp
@@ -29,8 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KActionCollection>
 #include <KDE/KAction>
 
-#include "tile.h"
-#include "tilinglayout.h"
+#include "tiling/tile.h"
+#include "tiling/tilinglayout.h"
 #include "tilinglayoutfactory.h"
 #include "workspace.h"
 
diff --git a/tilinglayout.cpp b/tiling/tilinglayout.cpp
similarity index 98%
rename from tilinglayout.cpp
rename to tiling/tilinglayout.cpp
index da50b7629e..0e1d642ad5 100644
--- a/tilinglayout.cpp
+++ b/tiling/tilinglayout.cpp
@@ -18,12 +18,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
-#include "tilinglayout.h"
+#include "tiling/tilinglayout.h"
 
 #include <QCursor>
 
 #include "client.h"
-#include "tile.h"
+#include "tiling/tile.h"
 #include "workspace.h"
 #include "tiling/tiling.h"
 
diff --git a/tilinglayout.h b/tiling/tilinglayout.h
similarity index 100%
rename from tilinglayout.h
rename to tiling/tilinglayout.h
diff --git a/tilinglayoutfactory.cpp b/tilinglayoutfactory.cpp
index 887b0b3ff0..78734e9f90 100644
--- a/tilinglayoutfactory.cpp
+++ b/tilinglayoutfactory.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 
 #include "notifications.h"
-#include "tile.h"
+#include "tiling/tile.h"
 #include "client.h"
 
 #include "tilinglayouts/spiral/spiral.h"
diff --git a/tilinglayouts/columns/columns.cpp b/tilinglayouts/columns/columns.cpp
index 0fd33d1a76..d0e1e1b5ec 100644
--- a/tilinglayouts/columns/columns.cpp
+++ b/tilinglayouts/columns/columns.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "columns.h"
 
 #include "client.h"
-#include "tile.h"
+#include "tiling/tile.h"
 
 #include <kdecoration.h>
 
diff --git a/tilinglayouts/columns/columns.h b/tilinglayouts/columns/columns.h
index bcd6f89d77..b8bb1f5469 100644
--- a/tilinglayouts/columns/columns.h
+++ b/tilinglayouts/columns/columns.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Qt>
 
-#include "tilinglayout.h"
+#include "tiling/tilinglayout.h"
 
 namespace KWin
 {
diff --git a/tilinglayouts/floating/floating.cpp b/tilinglayouts/floating/floating.cpp
index a0c33e601e..e6623b649c 100644
--- a/tilinglayouts/floating/floating.cpp
+++ b/tilinglayouts/floating/floating.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "floating.h"
 
-#include "tile.h"
+#include "tiling/tile.h"
 #include "client.h"
 
 namespace KWin
diff --git a/tilinglayouts/floating/floating.h b/tilinglayouts/floating/floating.h
index c3b40fa3b2..1c007cbfab 100644
--- a/tilinglayouts/floating/floating.h
+++ b/tilinglayouts/floating/floating.h
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Qt>
 #include <QSet>
 
-#include "tilinglayout.h"
-#include "tile.h"
+#include "tiling/tilinglayout.h"
+#include "tiling/tile.h"
 
 namespace KWin
 {
diff --git a/tilinglayouts/spiral/spiral.cpp b/tilinglayouts/spiral/spiral.cpp
index 979e001e52..b70be995e6 100644
--- a/tilinglayouts/spiral/spiral.cpp
+++ b/tilinglayouts/spiral/spiral.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "spiral.h"
 
 #include "client.h"
-#include "tile.h"
+#include "tiling/tile.h"
 
 namespace KWin
 {
diff --git a/tilinglayouts/spiral/spiral.h b/tilinglayouts/spiral/spiral.h
index f5749f88ef..4621fb06fa 100644
--- a/tilinglayouts/spiral/spiral.h
+++ b/tilinglayouts/spiral/spiral.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Qt>
 
-#include "tilinglayout.h"
+#include "tiling/tilinglayout.h"
 
 namespace KWin
 {
diff --git a/useractions.cpp b/useractions.cpp
index 7d6c1b6886..70206e1df0 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include "effects.h"
 #ifdef KWIN_BUILD_TILING
-#include "tile.h"
-#include "tilinglayout.h"
+#include "tiling/tile.h"
+#include "tiling/tilinglayout.h"
 #include "tiling/tiling.h"
 #endif
 
diff --git a/workspace.cpp b/workspace.cpp
index 0ab3280ef2..4525c01919 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -62,8 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "effects.h"
 #include "overlaywindow.h"
 #ifdef KWIN_BUILD_TILING
-#include "tile.h"
-#include "tilinglayout.h"
+#include "tiling/tile.h"
+#include "tiling/tilinglayout.h"
 #include "tiling/tiling.h"
 #endif
 #ifdef KWIN_BUILD_SCRIPTING