diff --git a/configure.in b/configure.in
index 1a4157d85..cfa3126a8 100644
--- a/configure.in
+++ b/configure.in
@@ -535,7 +535,7 @@ src/wm-tester/Makefile
 src/libmetacity-private.pc
 src/tools/Makefile
 src/themes/Makefile
-src/compositor/clutter-plugins/Makefile
+src/compositor/clutter/clutter-plugins/Makefile
 po/Makefile.in
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1544f1482..f758a372c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,10 @@ lib_LTLIBRARIES = libmetacity-private.la
 SUBDIRS=wm-tester tools themes
 
 if WITH_CLUTTER
-SUBDIRS += compositor/clutter-plugins
+SUBDIRS += compositor/clutter/clutter-plugins
 endif
 
-INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
+INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
 
 metacity_SOURCES= 				\
 	core/async-getprop.c			\
@@ -103,15 +103,16 @@ metacity_SOURCES= 				\
 	ui/ui.c
 
 if WITH_CLUTTER
-metacity_SOURCES +=	compositor/compositor-clutter.c			\
-			compositor/compositor-clutter.h			\
-			compositor/tidy-texture-frame.c			\
-			compositor/tidy-texture-frame.h			\
-			compositor/shaped-texture.c			\
-			compositor/shaped-texture.h			\
-			include/compositor-clutter-plugin.h		\
-			compositor/compositor-clutter-plugin-manager.c	\
-			compositor/compositor-clutter-plugin-manager.h
+metacity_SOURCES += \
+	compositor/clutter/compositor-clutter.c	\
+	compositor/clutter/compositor-clutter.h	\
+	compositor/clutter/tidy-texture-frame.c	\
+	compositor/clutter/tidy-texture-frame.h	\
+	compositor/clutter/shaped-texture.c	\
+	compositor/clutter/shaped-texture.h	\
+	include/compositor-clutter-plugin.h	\
+	compositor/clutter/compositor-clutter-plugin-manager.c	\
+	compositor/clutter/compositor-clutter-plugin-manager.h
 endif
 
 # by setting libmetacity_private_la_CFLAGS, the files shared with
diff --git a/src/compositor/clutter-plugins/Makefile.am b/src/compositor/clutter/clutter-plugins/Makefile.am
similarity index 100%
rename from src/compositor/clutter-plugins/Makefile.am
rename to src/compositor/clutter/clutter-plugins/Makefile.am
diff --git a/src/compositor/clutter-plugins/README b/src/compositor/clutter/clutter-plugins/README
similarity index 100%
rename from src/compositor/clutter-plugins/README
rename to src/compositor/clutter/clutter-plugins/README
diff --git a/src/compositor/clutter-plugins/default.c b/src/compositor/clutter/clutter-plugins/default.c
similarity index 100%
rename from src/compositor/clutter-plugins/default.c
rename to src/compositor/clutter/clutter-plugins/default.c
diff --git a/src/compositor/clutter-plugins/moblin.c b/src/compositor/clutter/clutter-plugins/moblin.c
similarity index 100%
rename from src/compositor/clutter-plugins/moblin.c
rename to src/compositor/clutter/clutter-plugins/moblin.c
diff --git a/src/compositor/compositor-clutter-plugin-manager.c b/src/compositor/clutter/compositor-clutter-plugin-manager.c
similarity index 100%
rename from src/compositor/compositor-clutter-plugin-manager.c
rename to src/compositor/clutter/compositor-clutter-plugin-manager.c
diff --git a/src/compositor/compositor-clutter-plugin-manager.h b/src/compositor/clutter/compositor-clutter-plugin-manager.h
similarity index 100%
rename from src/compositor/compositor-clutter-plugin-manager.h
rename to src/compositor/clutter/compositor-clutter-plugin-manager.h
diff --git a/src/compositor/compositor-clutter.c b/src/compositor/clutter/compositor-clutter.c
similarity index 100%
rename from src/compositor/compositor-clutter.c
rename to src/compositor/clutter/compositor-clutter.c
diff --git a/src/compositor/shaped-texture.c b/src/compositor/clutter/shaped-texture.c
similarity index 100%
rename from src/compositor/shaped-texture.c
rename to src/compositor/clutter/shaped-texture.c
diff --git a/src/compositor/shaped-texture.h b/src/compositor/clutter/shaped-texture.h
similarity index 100%
rename from src/compositor/shaped-texture.h
rename to src/compositor/clutter/shaped-texture.h
diff --git a/src/compositor/tidy-texture-frame.c b/src/compositor/clutter/tidy-texture-frame.c
similarity index 100%
rename from src/compositor/tidy-texture-frame.c
rename to src/compositor/clutter/tidy-texture-frame.c
diff --git a/src/compositor/tidy-texture-frame.h b/src/compositor/clutter/tidy-texture-frame.h
similarity index 100%
rename from src/compositor/tidy-texture-frame.h
rename to src/compositor/clutter/tidy-texture-frame.h