diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index eeaa7222e..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-NULL =
-
-SUBDIRS = build clutter tests
-
-if BUILD_EXAMPLES
-SUBDIRS += examples
-endif
-
-DIST_SUBDIRS = clutter tests examples build
-
-# XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
-# that jhbuild sets while still retaining build/autotools as the authoritative
-# source for m4 macros
-ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
-
-CLEANFILES = $(pcfiles)
-
-DISTCLEANFILES =
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-flags
-
-# proxy rules for tests
-test-report full-report:
-	$(MAKE) -C tests/conform $(@)
-
-perf-report:
-	$(MAKE) -C tests/performance $(@)
-
-if ENABLE_GCOV
-# use recursive makes in order to ignore errors during check/perf
-lcov:
-	-$(MAKE) $(AM_MAKEFLAGS) -C clutter check
-	-$(MAKE) $(AM_MAKEFLAGS) -C tests/conform test
-	$(MAKE) $(AM_MAKEFLAGS) genlcov
-
-# we have to massage the lcov.info file slightly to hide the effect of libtool
-# placing the objects files in the .libs/ directory separate from the *.c
-genlcov:
-	$(LTP) --directory $(top_builddir) --capture --output-file clutter-lcov.info --test-name CLUTTER_TEST --no-checksum
-	$(SED) -e 's#.libs/##' < clutter-lcov.info > clutter-lcov.info.tmp
-	LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory clutter-lcov --title "Clutter Code Coverage" --show-details clutter-lcov.info.tmp
-	rm -f clutter-lcov.info.tmp
-
-lcov-clean:
-	-$(LTP) --directory $(top_builddir) -z
-	-$(RM) -rf clutter-lcov.info clutter-lcov
-else
-lcov genlcov lcov-clean:
-	@echo You need to configure Clutter with support for gcov enabled.
-	@echo e.g., ./configure --enable-gcov
-endif
-
-.PHONY: test-report full-report perf-report lcov genlcov lcov-clean
diff --git a/.gitignore b/clutter/.gitignore
similarity index 100%
rename from .gitignore
rename to clutter/.gitignore
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 76ecfba64..eeaa7222e 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -1,681 +1,53 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-# preamble
 NULL =
 
-# common definitions
-CLEANFILES =
+SUBDIRS = build clutter tests
+
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
+
+DIST_SUBDIRS = clutter tests examples build
+
+# XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
+# that jhbuild sets while still retaining build/autotools as the authoritative
+# source for m4 macros
+ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
+
+CLEANFILES = $(pcfiles)
+
 DISTCLEANFILES =
-EXTRA_DIST =
-BUILT_SOURCES =
 
-AM_CPPFLAGS = \
-	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
-	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
-	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
-	-DCLUTTER_LOCALEDIR=\""$(localedir)"\"	\
-	-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
-	-DCLUTTER_COMPILATION=1			\
-	-DCOGL_ENABLE_EXPERIMENTAL_API		\
-	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
-	-DG_LOG_DOMAIN=\"Clutter\" 		\
-	-I$(top_srcdir) 			\
-	-I$(top_srcdir)/clutter			\
-	-I$(top_srcdir)/clutter/cally		\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/clutter		\
-	$(CLUTTER_DEPRECATED_CFLAGS)		\
-	$(CLUTTER_DEBUG_CFLAGS)			\
-	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
-	$(NULL)
-
-AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-
-# these are the gir files we generate using g-ir-scanner
-INTROSPECTION_GIRS =
-
-# the base include path for headers
-clutter_base_includedir = $(includedir)/mutter/clutter-$(CLUTTER_API_VERSION)
-clutter_includedir = $(clutter_base_includedir)/clutter
-clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
-
-# pkg-config files
-pc_files =
-
-# common sources - please, keep these sorted alphabetically
-source_h =					\
-	clutter-action.h		\
-	clutter-actor-meta.h		\
-	clutter-actor.h		\
-	clutter-align-constraint.h	\
-	clutter-animatable.h          \
-	clutter-backend.h		\
-	clutter-bind-constraint.h	\
-	clutter-binding-pool.h 	\
-	clutter-bin-layout.h		\
-	clutter-blur-effect.h		\
-	clutter-box-layout.h		\
-	clutter-brightness-contrast-effect.h	\
-	clutter-cairo.h		\
-	clutter-canvas.h		\
-	clutter-child-meta.h		\
-	clutter-click-action.h	\
-	clutter-cogl-compat.h 	\
-	clutter-clone.h		\
-	clutter-color-static.h	\
-	clutter-color.h		\
-	clutter-colorize-effect.h	\
-	clutter-constraint.h		\
-	clutter-container.h		\
-	clutter-content.h		\
-	clutter-deform-effect.h	\
-	clutter-deprecated.h		\
-	clutter-desaturate-effect.h	\
-	clutter-device-manager.h	\
-	clutter-drag-action.h		\
-	clutter-drop-action.h		\
-	clutter-effect.h		\
-	clutter-enums.h		\
-	clutter-event.h 		\
-	clutter-feature.h 		\
-	clutter-fixed-layout.h	\
-	clutter-flow-layout.h		\
-	clutter-gesture-action.h 	\
-	clutter-grid-layout.h 	\
-	clutter-group.h 		\
-	clutter-image.h		\
-	clutter-input-device.h	\
-        clutter-interval.h            \
-	clutter-keyframe-transition.h	\
-	clutter-keysyms.h 		\
-	clutter-layout-manager.h	\
-	clutter-layout-meta.h		\
-	clutter-macros.h		\
-	clutter-main.h		\
-	clutter-offscreen-effect.h	\
-	clutter-page-turn-effect.h	\
-	clutter-paint-nodes.h		\
-	clutter-paint-node.h		\
-	clutter-pan-action.h		\
-	clutter-path-constraint.h	\
-	clutter-path.h		\
-	clutter-property-transition.h	\
-	clutter-rotate-action.h	\
-	clutter-script.h		\
-	clutter-scriptable.h		\
-	clutter-scroll-actor.h	\
-	clutter-settings.h		\
-	clutter-shader-effect.h	\
-	clutter-shader-types.h	\
-	clutter-swipe-action.h	\
-	clutter-snap-constraint.h	\
-	clutter-stage.h 		\
-	clutter-stage-manager.h	\
-	clutter-tap-action.h		\
-	clutter-test-utils.h		\
-	clutter-texture.h 		\
-	clutter-text.h		\
-	clutter-text-buffer.h		\
-	clutter-timeline.h 		\
-	clutter-transition-group.h	\
-	clutter-transition.h		\
-	clutter-types.h		\
-	clutter-units.h 		\
-	clutter-zoom-action.h		\
-	$(NULL)
-
-source_c = \
-	clutter-action.c		\
-	clutter-actor-box.c		\
-	clutter-actor-meta.c		\
-	clutter-actor.c		\
-	clutter-align-constraint.c	\
-	clutter-animatable.c		\
-	clutter-backend.c		\
-	clutter-base-types.c		\
-	clutter-bezier.c		\
-	clutter-bind-constraint.c	\
-	clutter-binding-pool.c	\
-	clutter-bin-layout.c		\
-	clutter-blur-effect.c		\
-	clutter-box-layout.c		\
-	clutter-brightness-contrast-effect.c	\
-	clutter-cairo.c		\
-	clutter-canvas.c		\
-	clutter-child-meta.c		\
-	clutter-click-action.c	\
-	clutter-clone.c		\
-	clutter-color.c 		\
-	clutter-colorize-effect.c	\
-	clutter-constraint.c		\
-	clutter-container.c		\
-	clutter-content.c		\
-	clutter-deform-effect.c	\
-	clutter-desaturate-effect.c	\
-	clutter-device-manager.c	\
-	clutter-drag-action.c		\
-	clutter-drop-action.c		\
-	clutter-effect.c		\
-	clutter-event.c 		\
-	clutter-feature.c 		\
-	clutter-fixed-layout.c	\
-	clutter-flatten-effect.c	\
-	clutter-flow-layout.c		\
-	clutter-gesture-action.c 	\
-	clutter-grid-layout.c 	\
-	clutter-image.c		\
-	clutter-input-device.c	\
-	clutter-interval.c            \
-	clutter-keyframe-transition.c	\
-	clutter-keysyms-table.c	\
-	clutter-layout-manager.c	\
-	clutter-layout-meta.c		\
-	clutter-main.c 		\
-	clutter-master-clock.c	\
-	clutter-master-clock-default.c	\
-	clutter-offscreen-effect.c	\
-	clutter-page-turn-effect.c	\
-	clutter-paint-nodes.c		\
-	clutter-paint-node.c		\
-	clutter-pan-action.c		\
-	clutter-path-constraint.c	\
-	clutter-path.c		\
-	clutter-property-transition.c	\
-	clutter-rotate-action.c	\
-	clutter-script.c		\
-	clutter-script-parser.c	\
-	clutter-scriptable.c		\
-	clutter-scroll-actor.c	\
-	clutter-settings.c		\
-	clutter-shader-effect.c	\
-	clutter-shader-types.c	\
-	clutter-swipe-action.c	\
-	clutter-snap-constraint.c	\
-	clutter-stage.c		\
-	clutter-stage-manager.c	\
-	clutter-stage-window.c	\
-	clutter-tap-action.c		\
-	clutter-test-utils.c		\
-	clutter-text.c		\
-	clutter-text-buffer.c		\
-	clutter-transition-group.c	\
-	clutter-transition.c		\
-	clutter-timeline.c 		\
-	clutter-units.c		\
-	clutter-util.c 		\
-	clutter-paint-volume.c 	\
-	clutter-zoom-action.c 	\
-	$(NULL)
-
-# private headers; these should not be distributed or introspected
-source_h_priv = \
-	clutter-actor-meta-private.h		\
-	clutter-actor-private.h			\
-	clutter-backend-private.h		\
-	clutter-bezier.h			\
-	clutter-constraint-private.h		\
-	clutter-content-private.h		\
-	clutter-debug.h 			\
-	clutter-device-manager-private.h	\
-	clutter-easing.h			\
-	clutter-effect-private.h		\
-	clutter-event-translator.h		\
-	clutter-event-private.h			\
-	clutter-flatten-effect.h		\
-	clutter-gesture-action-private.h	\
-	clutter-id-pool.h 			\
-	clutter-master-clock.h			\
-	clutter-master-clock-default.h		\
-	clutter-offscreen-effect-private.h	\
-	clutter-paint-node-private.h		\
-	clutter-paint-volume-private.h		\
-	clutter-private.h 			\
-	clutter-script-private.h		\
-	clutter-settings-private.h		\
-	clutter-stage-manager-private.h		\
-	clutter-stage-private.h			\
-	clutter-stage-window.h			\
-	$(NULL)
-
-# private source code; these should not be introspected
-source_c_priv = \
-	clutter-easing.c		\
-	clutter-event-translator.c	\
-	clutter-id-pool.c 		\
-	$(NULL)
-
-# deprecated installed headers
-deprecated_h = \
-	deprecated/clutter-actor.h			\
-	deprecated/clutter-alpha.h 			\
-	deprecated/clutter-animatable.h		\
-	deprecated/clutter-animation.h		\
-	deprecated/clutter-animator.h			\
-	deprecated/clutter-backend.h			\
-	deprecated/clutter-behaviour.h 		\
-	deprecated/clutter-behaviour-depth.h 		\
-	deprecated/clutter-behaviour-ellipse.h	\
-	deprecated/clutter-behaviour-opacity.h 	\
-	deprecated/clutter-behaviour-path.h 		\
-	deprecated/clutter-behaviour-rotate.h 	\
-	deprecated/clutter-behaviour-scale.h 		\
-	deprecated/clutter-bin-layout.h		\
-	deprecated/clutter-box.h			\
-	deprecated/clutter-cairo-texture.h		\
-	deprecated/clutter-container.h		\
-	deprecated/clutter-fixed.h			\
-	deprecated/clutter-frame-source.h		\
-	deprecated/clutter-group.h			\
-	deprecated/clutter-input-device.h		\
-	deprecated/clutter-keysyms.h			\
-	deprecated/clutter-list-model.h			\
-	deprecated/clutter-main.h			\
-	deprecated/clutter-media.h			\
-	deprecated/clutter-model.h			\
-	deprecated/clutter-rectangle.h		\
-	deprecated/clutter-score.h 			\
-	deprecated/clutter-shader.h 			\
-	deprecated/clutter-stage-manager.h		\
-	deprecated/clutter-stage.h			\
-	deprecated/clutter-state.h			\
-	deprecated/clutter-table-layout.h		\
-	deprecated/clutter-texture.h			\
-	deprecated/clutter-timeline.h 		\
-	deprecated/clutter-timeout-pool.h 		\
-	deprecated/clutter-util.h 			\
-	$(NULL)
-
-# deprecated source code
-deprecated_c = \
-	deprecated/clutter-actor-deprecated.c		\
-	deprecated/clutter-alpha.c 			\
-	deprecated/clutter-animation.c		\
-	deprecated/clutter-animator.c			\
-	deprecated/clutter-behaviour.c 		\
-	deprecated/clutter-behaviour-depth.c		\
-	deprecated/clutter-behaviour-ellipse.c	\
-	deprecated/clutter-behaviour-opacity.c	\
-	deprecated/clutter-behaviour-path.c		\
-	deprecated/clutter-behaviour-rotate.c		\
-	deprecated/clutter-behaviour-scale.c		\
-	deprecated/clutter-box.c			\
-	deprecated/clutter-cairo-texture.c		\
-	deprecated/clutter-fixed.c			\
-	deprecated/clutter-frame-source.c		\
-	deprecated/clutter-group.c 			\
-	deprecated/clutter-input-device-deprecated.c	\
-	deprecated/clutter-layout-manager-deprecated.c \
-	deprecated/clutter-list-model.c			\
-	deprecated/clutter-media.c			\
-	deprecated/clutter-model.c			\
-	deprecated/clutter-rectangle.c 		\
-	deprecated/clutter-score.c 			\
-	deprecated/clutter-shader.c 			\
-	deprecated/clutter-state.c			\
-	deprecated/clutter-table-layout.c		\
-	deprecated/clutter-texture.c 			\
-	deprecated/clutter-timeout-pool.c		\
-	$(NULL)
-
-# deprecated private headers; these should not be installed
-deprecated_h_priv = \
-	deprecated/clutter-model-private.h	\
-	deprecated/clutter-timeout-interval.h	\
-	$(NULL)
-
-# deprecated private source code; these should not be introspected
-deprecated_c_priv = \
-	deprecated/clutter-timeout-interval.c	\
-	$(NULL)
-
-# built sources
-built_source_c = \
-	clutter-enum-types.c			\
-	clutter-marshal.c			\
-	$(NULL)
-
-# built headers
-built_source_h = \
-	clutter-enum-types.h			\
-	clutter-marshal.h			\
-	$(NULL)
-
-# config header
-DISTCLEANFILES += clutter-config.h
-EXTRA_DIST += clutter-config.h.in
-
-# version header
-DISTCLEANFILES += clutter-version.h
-EXTRA_DIST += clutter-version.h.in clutter-version.h
-
-# key symbol update script
-EXTRA_DIST += clutter-keysyms-update.pl
-
-pc_files += mutter-clutter-$(CLUTTER_API_VERSION).pc
-
-# in order to be compatible with Clutter < 1.10, when we shipped a single
-# shared library whose name was determined by the single backend it
-# supported, we need to install symbolic links so that existing applications
-# using Clutter won't break in the Brave New World of multi-backend support
-# in the same shared object.
-compat_libs =
-
-# backends source listings
-#
-#   backend_source_c := source code
-#   backend_source_h := installed public headers
-#   backend_source_c_priv := source that should not be scanned by g-i
-#   backend_source_h_priv := private headers
-#   backend_source_built := built sources
-#
-backend_source_c =
-backend_source_h =
-backend_source_c_priv =
-backend_source_h_priv =
-backend_source_built =
-
-# X11 backend rules
-x11_source_c = \
-	x11/clutter-backend-x11.c		\
-	x11/clutter-device-manager-core-x11.c	\
-	x11/clutter-event-x11.c		\
-	x11/clutter-input-device-core-x11.c	\
-	x11/clutter-keymap-x11.c		\
-	x11/clutter-stage-x11.c		\
-	x11/clutter-x11-texture-pixmap.c	\
-	$(NULL)
-
-x11_source_h = \
-	x11/clutter-x11.h			\
-	x11/clutter-x11-texture-pixmap.h	\
-	$(NULL)
-
-x11_source_h_priv = \
-	x11/clutter-backend-x11.h		\
-	x11/clutter-device-manager-core-x11.h	\
-	x11/clutter-input-device-core-x11.h	\
-	x11/clutter-keymap-x11.h		\
-	x11/clutter-settings-x11.h		\
-	x11/clutter-stage-x11.h		\
-	$(NULL)
-
-x11_source_c_priv = \
-	x11/xsettings/xsettings-client.c	\
-	x11/xsettings/xsettings-client.h	\
-	x11/xsettings/xsettings-common.c	\
-	x11/xsettings/xsettings-common.h	\
-	$(NULL)
-
-x11_source_c += \
-	x11/clutter-device-manager-xi2.c	\
-	x11/clutter-input-device-xi2.c	\
-	$(NULL)
-
-x11_source_h_priv += \
-	x11/clutter-device-manager-xi2.h	\
-	x11/clutter-input-device-xi2.h	\
-	$(NULL)
-
-backend_source_h += $(x11_source_h)
-backend_source_c += $(x11_source_c)
-backend_source_h_priv += $(x11_source_h_priv)
-backend_source_c_priv += $(x11_source_c_priv)
-
-# the list of files we want to introspect on X11
-x11_introspection = $(x11_source_c) $(x11_source_h)
-
-clutterx11_includedir = $(clutter_includedir)/x11
-clutterx11_include_HEADERS = $(x11_source_h)
-
-mutter-clutter-x11-$(CLUTTER_API_VERSION).pc: mutter-clutter-$(CLUTTER_API_VERSION).pc
-	$(QUIET_GEN)cp -f $< $(@F)
-
-pc_files += mutter-clutter-x11-$(CLUTTER_API_VERSION).pc
-
-# Shared cogl backend files
-cogl_source_h =
-
-cogl_source_c = \
-	cogl/clutter-stage-cogl.c	\
-	$(NULL)
-
-cogl_source_h_priv = \
-	cogl/clutter-stage-cogl.h	\
-	$(NULL)
-
-cogl_source_c_priv =
-
-backend_source_h += $(cogl_source_h)
-backend_source_c += $(cogl_source_c)
-backend_source_h_priv += $(cogl_source_h_priv)
-backend_source_c_priv += $(cogl_source_c_priv)
-
-backend_source_h += $(glx_source_h)
-backend_source_c += $(glx_source_c)
-
-evdev_c_priv = \
-	evdev/clutter-device-manager-evdev.c	\
-	evdev/clutter-input-device-evdev.c	\
-	evdev/clutter-event-evdev.c		\
-	$(NULL)
-evdev_h_priv = \
-	evdev/clutter-device-manager-evdev.h	\
-	evdev/clutter-input-device-evdev.h	\
-	$(NULL)
-evdev_h = evdev/clutter-evdev.h
-
-backend_source_c_priv += $(evdev_c_priv)
-backend_source_h_priv += $(evdev_h_priv)
-backend_source_h += $(evdev_h)
-
-clutterevdev_includedir = $(clutter_includedir)/evdev
-clutterevdev_include_HEADERS = $(evdev_h)
-
-backend_source_c += evdev/clutter-xkb-utils.c
-backend_source_h_priv += evdev/clutter-xkb-utils.h
-
-# EGL backend rules
-egl_source_h = \
-	egl/clutter-egl-headers.h	\
-	egl/clutter-egl.h		\
-	$(NULL)
-
-egl_source_h_priv = egl/clutter-backend-eglnative.h egl/clutter-stage-eglnative.h
-egl_source_c = egl/clutter-backend-eglnative.c egl/clutter-stage-eglnative.c
-
-wayland_compositor_source_h = \
-	wayland/clutter-wayland-compositor.h		\
-	wayland/clutter-wayland-surface.h
-backend_source_h += $(wayland_compositor_source_h)
-backend_source_c += \
-	wayland/clutter-wayland-surface.c
-
-wayland_compositor_includedir = $(clutter_includedir)/wayland
-wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
-
-backend_source_h += $(egl_source_h)
-backend_source_c += $(egl_source_c)
-backend_source_h_priv += $(egl_source_h_priv)
-
-clutteregl_includedir = $(clutter_includedir)/egl
-clutteregl_include_HEADERS = $(egl_source_h)
-
-# cally
-cally_sources_h = \
-	cally/cally-actor.h		\
-	cally/cally-clone.h		\
-	cally/cally-factory.h		\
-	cally/cally-group.h		\
-	cally/cally.h			\
-	cally/cally-main.h		\
-	cally/cally-rectangle.h	\
-	cally/cally-root.h		\
-	cally/cally-stage.h		\
-	cally/cally-text.h		\
-	cally/cally-texture.h		\
-	cally/cally-util.h		\
-	$(NULL)
-
-cally_sources_c = \
-	cally/cally-actor.c		\
-	cally/cally.c			\
-	cally/cally-clone.c		\
-	cally/cally-group.c		\
-	cally/cally-rectangle.c	\
-	cally/cally-root.c		\
-	cally/cally-stage.c		\
-	cally/cally-text.c		\
-	cally/cally-texture.c		\
-	cally/cally-util.c		\
-	$(NULL)
-
-cally_sources_private = \
-	cally/cally-actor-private.h	\
-	$(NULL)
-
-cally_includedir = $(clutter_base_includedir)/cally
-cally_include_HEADERS = $(cally_sources_h)
-
-# general build rules:
-# you should not need to modify anything below this point
-
-# glib-genmarshal rules
-glib_marshal_list = clutter-marshal.list
-glib_marshal_prefix = _clutter_marshal
-include $(srcdir)/Makefile.am.marshal
-
-# glib-mkenums rules
-glib_enum_h = clutter-enum-types.h
-glib_enum_c = clutter-enum-types.c
-glib_enum_headers = $(source_h) $(deprecated_h)
-include $(srcdir)/Makefile.am.enums
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pc_files)
-DISTCLEANFILES += $(pc_files)
-
-clutter_include_HEADERS = $(source_h) clutter.h clutter-version.h clutter-autocleanups.h
-nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
-
-clutter_deprecated_HEADERS = $(deprecated_h)
-
-mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-clutter-@CLUTTER_API_VERSION@.la
-
-libmutter_clutter_@CLUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(CLUTTER_LIBS)
-
-libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
-	$(backend_source_c) \
-	$(backend_source_h) \
-	$(backend_source_c_priv) \
-	$(backend_source_h_priv) \
-	$(source_c) \
-	$(source_h) \
-	$(source_c_priv) \
-	$(source_h_priv) \
-	$(deprecated_c) \
-	$(deprecated_h) \
-	$(deprecated_c_priv) \
-	$(deprecated_h_priv) \
-	$(cally_sources_c) \
-	$(cally_sources_h) \
-	$(cally_sources_private) \
-	$(NULL)
-
-nodist_libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
-	$(backend_source_built) \
-	$(built_source_c) \
-	$(built_source_h)
-
-libmutter_clutter_@CLUTTER_API_VERSION@_la_LDFLAGS = \
-	$(CLUTTER_LINK_FLAGS) \
-	$(CLUTTER_LT_LDFLAGS) \
-	-export-dynamic \
-	-rpath $(mutterlibdir) \
-	$(NULL)
-
-install-exec-local:
-	test -z "$(mutterlibdir)" || $(MKDIR_P) "$(DESTDIR)$(mutterlibdir)"
-	for lib in `echo $(compat_libs)`; do \
-	  (cd $(DESTDIR)$(mutterlibdir) && \
-	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
-	  ) ; \
-	  (cd $(DESTDIR)$(mutterlibdir) && \
-	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
-	      { rm -f $$lib.0 && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
-	    } \
-	  ) ; \
-	  (cd $(DESTDIR)$(mutterlibdir) && \
-	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
-	      { rm -f $$lib && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
-	    } \
-	  ) ; \
-	done
-
-# gobject-introspection rules
--include $(INTROSPECTION_MAKEFILE)
-
-Clutter-@CLUTTER_API_VERSION@.gir: libmutter-clutter-@CLUTTER_API_VERSION@.la Makefile
-
-Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter
-Clutter_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
-Clutter_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \
-	$(clutter_include_HEADERS) \
-	$(clutter_deprecated_HEADERS) \
-	$(nodist_clutter_include_HEADERS) \
-	$(source_c) \
-	$(deprecated_c) \
-	$(built_source_c)
-Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0
-Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
-	--warn-all \
-	--c-include='clutter/clutter.h' \
-	--pkg-export=clutter-@CLUTTER_API_VERSION@
-
-INTROSPECTION_GIRS += Clutter-@CLUTTER_API_VERSION@.gir
-
-Cally-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
-
-Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
-Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
-Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
-Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
-	--warn-all \
-	--c-include='cally/cally.h' \
-	--pkg-export=cally-@CLUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
-
-INTROSPECTION_GIRS += Cally-@CLUTTER_API_VERSION@.gir
-
-ClutterX11-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
-
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = ClutterX11
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
-	--warn-all \
-	--c-include='clutter/x11/clutter-x11.h' \
-	--pkg-export=clutter-x11-@CLUTTER_API_VERSION@ \
-	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
-
-INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir
-
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(mutterlibdir)
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(mutterlibdir)
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-EXTRA_DIST += \
-	Makefile.am.marshal	\
-	Makefile.am.enums
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
+DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-flags
+
+# proxy rules for tests
+test-report full-report:
+	$(MAKE) -C tests/conform $(@)
+
+perf-report:
+	$(MAKE) -C tests/performance $(@)
+
+if ENABLE_GCOV
+# use recursive makes in order to ignore errors during check/perf
+lcov:
+	-$(MAKE) $(AM_MAKEFLAGS) -C clutter check
+	-$(MAKE) $(AM_MAKEFLAGS) -C tests/conform test
+	$(MAKE) $(AM_MAKEFLAGS) genlcov
+
+# we have to massage the lcov.info file slightly to hide the effect of libtool
+# placing the objects files in the .libs/ directory separate from the *.c
+genlcov:
+	$(LTP) --directory $(top_builddir) --capture --output-file clutter-lcov.info --test-name CLUTTER_TEST --no-checksum
+	$(SED) -e 's#.libs/##' < clutter-lcov.info > clutter-lcov.info.tmp
+	LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory clutter-lcov --title "Clutter Code Coverage" --show-details clutter-lcov.info.tmp
+	rm -f clutter-lcov.info.tmp
+
+lcov-clean:
+	-$(LTP) --directory $(top_builddir) -z
+	-$(RM) -rf clutter-lcov.info clutter-lcov
+else
+lcov genlcov lcov-clean:
+	@echo You need to configure Clutter with support for gcov enabled.
+	@echo e.g., ./configure --enable-gcov
+endif
+
+.PHONY: test-report full-report perf-report lcov genlcov lcov-clean
diff --git a/build/Makefile.am b/clutter/build/Makefile.am
similarity index 100%
rename from build/Makefile.am
rename to clutter/build/Makefile.am
diff --git a/build/autotools/.gitignore b/clutter/build/autotools/.gitignore
similarity index 100%
rename from build/autotools/.gitignore
rename to clutter/build/autotools/.gitignore
diff --git a/build/autotools/Makefile.am b/clutter/build/autotools/Makefile.am
similarity index 100%
rename from build/autotools/Makefile.am
rename to clutter/build/autotools/Makefile.am
diff --git a/build/autotools/as-compiler-flag.m4 b/clutter/build/autotools/as-compiler-flag.m4
similarity index 100%
rename from build/autotools/as-compiler-flag.m4
rename to clutter/build/autotools/as-compiler-flag.m4
diff --git a/build/autotools/glib-tap.mk b/clutter/build/autotools/glib-tap.mk
similarity index 100%
rename from build/autotools/glib-tap.mk
rename to clutter/build/autotools/glib-tap.mk
diff --git a/build/autotools/glibtests.m4 b/clutter/build/autotools/glibtests.m4
similarity index 100%
rename from build/autotools/glibtests.m4
rename to clutter/build/autotools/glibtests.m4
diff --git a/build/autotools/introspection.m4 b/clutter/build/autotools/introspection.m4
similarity index 100%
rename from build/autotools/introspection.m4
rename to clutter/build/autotools/introspection.m4
diff --git a/build/autotools/tap-driver.sh b/clutter/build/autotools/tap-driver.sh
similarity index 100%
rename from build/autotools/tap-driver.sh
rename to clutter/build/autotools/tap-driver.sh
diff --git a/build/autotools/tap-test b/clutter/build/autotools/tap-test
similarity index 100%
rename from build/autotools/tap-test
rename to clutter/build/autotools/tap-test
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
new file mode 100644
index 000000000..76ecfba64
--- /dev/null
+++ b/clutter/clutter/Makefile.am
@@ -0,0 +1,681 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+# preamble
+NULL =
+
+# common definitions
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+BUILT_SOURCES =
+
+AM_CPPFLAGS = \
+	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
+	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
+	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
+	-DCLUTTER_LOCALEDIR=\""$(localedir)"\"	\
+	-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
+	-DCLUTTER_COMPILATION=1			\
+	-DCOGL_ENABLE_EXPERIMENTAL_API		\
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
+	-DG_LOG_DOMAIN=\"Clutter\" 		\
+	-I$(top_srcdir) 			\
+	-I$(top_srcdir)/clutter			\
+	-I$(top_srcdir)/clutter/cally		\
+	-I$(top_builddir)			\
+	-I$(top_builddir)/clutter		\
+	$(CLUTTER_DEPRECATED_CFLAGS)		\
+	$(CLUTTER_DEBUG_CFLAGS)			\
+	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
+	$(NULL)
+
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+
+# these are the gir files we generate using g-ir-scanner
+INTROSPECTION_GIRS =
+
+# the base include path for headers
+clutter_base_includedir = $(includedir)/mutter/clutter-$(CLUTTER_API_VERSION)
+clutter_includedir = $(clutter_base_includedir)/clutter
+clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
+
+# pkg-config files
+pc_files =
+
+# common sources - please, keep these sorted alphabetically
+source_h =					\
+	clutter-action.h		\
+	clutter-actor-meta.h		\
+	clutter-actor.h		\
+	clutter-align-constraint.h	\
+	clutter-animatable.h          \
+	clutter-backend.h		\
+	clutter-bind-constraint.h	\
+	clutter-binding-pool.h 	\
+	clutter-bin-layout.h		\
+	clutter-blur-effect.h		\
+	clutter-box-layout.h		\
+	clutter-brightness-contrast-effect.h	\
+	clutter-cairo.h		\
+	clutter-canvas.h		\
+	clutter-child-meta.h		\
+	clutter-click-action.h	\
+	clutter-cogl-compat.h 	\
+	clutter-clone.h		\
+	clutter-color-static.h	\
+	clutter-color.h		\
+	clutter-colorize-effect.h	\
+	clutter-constraint.h		\
+	clutter-container.h		\
+	clutter-content.h		\
+	clutter-deform-effect.h	\
+	clutter-deprecated.h		\
+	clutter-desaturate-effect.h	\
+	clutter-device-manager.h	\
+	clutter-drag-action.h		\
+	clutter-drop-action.h		\
+	clutter-effect.h		\
+	clutter-enums.h		\
+	clutter-event.h 		\
+	clutter-feature.h 		\
+	clutter-fixed-layout.h	\
+	clutter-flow-layout.h		\
+	clutter-gesture-action.h 	\
+	clutter-grid-layout.h 	\
+	clutter-group.h 		\
+	clutter-image.h		\
+	clutter-input-device.h	\
+        clutter-interval.h            \
+	clutter-keyframe-transition.h	\
+	clutter-keysyms.h 		\
+	clutter-layout-manager.h	\
+	clutter-layout-meta.h		\
+	clutter-macros.h		\
+	clutter-main.h		\
+	clutter-offscreen-effect.h	\
+	clutter-page-turn-effect.h	\
+	clutter-paint-nodes.h		\
+	clutter-paint-node.h		\
+	clutter-pan-action.h		\
+	clutter-path-constraint.h	\
+	clutter-path.h		\
+	clutter-property-transition.h	\
+	clutter-rotate-action.h	\
+	clutter-script.h		\
+	clutter-scriptable.h		\
+	clutter-scroll-actor.h	\
+	clutter-settings.h		\
+	clutter-shader-effect.h	\
+	clutter-shader-types.h	\
+	clutter-swipe-action.h	\
+	clutter-snap-constraint.h	\
+	clutter-stage.h 		\
+	clutter-stage-manager.h	\
+	clutter-tap-action.h		\
+	clutter-test-utils.h		\
+	clutter-texture.h 		\
+	clutter-text.h		\
+	clutter-text-buffer.h		\
+	clutter-timeline.h 		\
+	clutter-transition-group.h	\
+	clutter-transition.h		\
+	clutter-types.h		\
+	clutter-units.h 		\
+	clutter-zoom-action.h		\
+	$(NULL)
+
+source_c = \
+	clutter-action.c		\
+	clutter-actor-box.c		\
+	clutter-actor-meta.c		\
+	clutter-actor.c		\
+	clutter-align-constraint.c	\
+	clutter-animatable.c		\
+	clutter-backend.c		\
+	clutter-base-types.c		\
+	clutter-bezier.c		\
+	clutter-bind-constraint.c	\
+	clutter-binding-pool.c	\
+	clutter-bin-layout.c		\
+	clutter-blur-effect.c		\
+	clutter-box-layout.c		\
+	clutter-brightness-contrast-effect.c	\
+	clutter-cairo.c		\
+	clutter-canvas.c		\
+	clutter-child-meta.c		\
+	clutter-click-action.c	\
+	clutter-clone.c		\
+	clutter-color.c 		\
+	clutter-colorize-effect.c	\
+	clutter-constraint.c		\
+	clutter-container.c		\
+	clutter-content.c		\
+	clutter-deform-effect.c	\
+	clutter-desaturate-effect.c	\
+	clutter-device-manager.c	\
+	clutter-drag-action.c		\
+	clutter-drop-action.c		\
+	clutter-effect.c		\
+	clutter-event.c 		\
+	clutter-feature.c 		\
+	clutter-fixed-layout.c	\
+	clutter-flatten-effect.c	\
+	clutter-flow-layout.c		\
+	clutter-gesture-action.c 	\
+	clutter-grid-layout.c 	\
+	clutter-image.c		\
+	clutter-input-device.c	\
+	clutter-interval.c            \
+	clutter-keyframe-transition.c	\
+	clutter-keysyms-table.c	\
+	clutter-layout-manager.c	\
+	clutter-layout-meta.c		\
+	clutter-main.c 		\
+	clutter-master-clock.c	\
+	clutter-master-clock-default.c	\
+	clutter-offscreen-effect.c	\
+	clutter-page-turn-effect.c	\
+	clutter-paint-nodes.c		\
+	clutter-paint-node.c		\
+	clutter-pan-action.c		\
+	clutter-path-constraint.c	\
+	clutter-path.c		\
+	clutter-property-transition.c	\
+	clutter-rotate-action.c	\
+	clutter-script.c		\
+	clutter-script-parser.c	\
+	clutter-scriptable.c		\
+	clutter-scroll-actor.c	\
+	clutter-settings.c		\
+	clutter-shader-effect.c	\
+	clutter-shader-types.c	\
+	clutter-swipe-action.c	\
+	clutter-snap-constraint.c	\
+	clutter-stage.c		\
+	clutter-stage-manager.c	\
+	clutter-stage-window.c	\
+	clutter-tap-action.c		\
+	clutter-test-utils.c		\
+	clutter-text.c		\
+	clutter-text-buffer.c		\
+	clutter-transition-group.c	\
+	clutter-transition.c		\
+	clutter-timeline.c 		\
+	clutter-units.c		\
+	clutter-util.c 		\
+	clutter-paint-volume.c 	\
+	clutter-zoom-action.c 	\
+	$(NULL)
+
+# private headers; these should not be distributed or introspected
+source_h_priv = \
+	clutter-actor-meta-private.h		\
+	clutter-actor-private.h			\
+	clutter-backend-private.h		\
+	clutter-bezier.h			\
+	clutter-constraint-private.h		\
+	clutter-content-private.h		\
+	clutter-debug.h 			\
+	clutter-device-manager-private.h	\
+	clutter-easing.h			\
+	clutter-effect-private.h		\
+	clutter-event-translator.h		\
+	clutter-event-private.h			\
+	clutter-flatten-effect.h		\
+	clutter-gesture-action-private.h	\
+	clutter-id-pool.h 			\
+	clutter-master-clock.h			\
+	clutter-master-clock-default.h		\
+	clutter-offscreen-effect-private.h	\
+	clutter-paint-node-private.h		\
+	clutter-paint-volume-private.h		\
+	clutter-private.h 			\
+	clutter-script-private.h		\
+	clutter-settings-private.h		\
+	clutter-stage-manager-private.h		\
+	clutter-stage-private.h			\
+	clutter-stage-window.h			\
+	$(NULL)
+
+# private source code; these should not be introspected
+source_c_priv = \
+	clutter-easing.c		\
+	clutter-event-translator.c	\
+	clutter-id-pool.c 		\
+	$(NULL)
+
+# deprecated installed headers
+deprecated_h = \
+	deprecated/clutter-actor.h			\
+	deprecated/clutter-alpha.h 			\
+	deprecated/clutter-animatable.h		\
+	deprecated/clutter-animation.h		\
+	deprecated/clutter-animator.h			\
+	deprecated/clutter-backend.h			\
+	deprecated/clutter-behaviour.h 		\
+	deprecated/clutter-behaviour-depth.h 		\
+	deprecated/clutter-behaviour-ellipse.h	\
+	deprecated/clutter-behaviour-opacity.h 	\
+	deprecated/clutter-behaviour-path.h 		\
+	deprecated/clutter-behaviour-rotate.h 	\
+	deprecated/clutter-behaviour-scale.h 		\
+	deprecated/clutter-bin-layout.h		\
+	deprecated/clutter-box.h			\
+	deprecated/clutter-cairo-texture.h		\
+	deprecated/clutter-container.h		\
+	deprecated/clutter-fixed.h			\
+	deprecated/clutter-frame-source.h		\
+	deprecated/clutter-group.h			\
+	deprecated/clutter-input-device.h		\
+	deprecated/clutter-keysyms.h			\
+	deprecated/clutter-list-model.h			\
+	deprecated/clutter-main.h			\
+	deprecated/clutter-media.h			\
+	deprecated/clutter-model.h			\
+	deprecated/clutter-rectangle.h		\
+	deprecated/clutter-score.h 			\
+	deprecated/clutter-shader.h 			\
+	deprecated/clutter-stage-manager.h		\
+	deprecated/clutter-stage.h			\
+	deprecated/clutter-state.h			\
+	deprecated/clutter-table-layout.h		\
+	deprecated/clutter-texture.h			\
+	deprecated/clutter-timeline.h 		\
+	deprecated/clutter-timeout-pool.h 		\
+	deprecated/clutter-util.h 			\
+	$(NULL)
+
+# deprecated source code
+deprecated_c = \
+	deprecated/clutter-actor-deprecated.c		\
+	deprecated/clutter-alpha.c 			\
+	deprecated/clutter-animation.c		\
+	deprecated/clutter-animator.c			\
+	deprecated/clutter-behaviour.c 		\
+	deprecated/clutter-behaviour-depth.c		\
+	deprecated/clutter-behaviour-ellipse.c	\
+	deprecated/clutter-behaviour-opacity.c	\
+	deprecated/clutter-behaviour-path.c		\
+	deprecated/clutter-behaviour-rotate.c		\
+	deprecated/clutter-behaviour-scale.c		\
+	deprecated/clutter-box.c			\
+	deprecated/clutter-cairo-texture.c		\
+	deprecated/clutter-fixed.c			\
+	deprecated/clutter-frame-source.c		\
+	deprecated/clutter-group.c 			\
+	deprecated/clutter-input-device-deprecated.c	\
+	deprecated/clutter-layout-manager-deprecated.c \
+	deprecated/clutter-list-model.c			\
+	deprecated/clutter-media.c			\
+	deprecated/clutter-model.c			\
+	deprecated/clutter-rectangle.c 		\
+	deprecated/clutter-score.c 			\
+	deprecated/clutter-shader.c 			\
+	deprecated/clutter-state.c			\
+	deprecated/clutter-table-layout.c		\
+	deprecated/clutter-texture.c 			\
+	deprecated/clutter-timeout-pool.c		\
+	$(NULL)
+
+# deprecated private headers; these should not be installed
+deprecated_h_priv = \
+	deprecated/clutter-model-private.h	\
+	deprecated/clutter-timeout-interval.h	\
+	$(NULL)
+
+# deprecated private source code; these should not be introspected
+deprecated_c_priv = \
+	deprecated/clutter-timeout-interval.c	\
+	$(NULL)
+
+# built sources
+built_source_c = \
+	clutter-enum-types.c			\
+	clutter-marshal.c			\
+	$(NULL)
+
+# built headers
+built_source_h = \
+	clutter-enum-types.h			\
+	clutter-marshal.h			\
+	$(NULL)
+
+# config header
+DISTCLEANFILES += clutter-config.h
+EXTRA_DIST += clutter-config.h.in
+
+# version header
+DISTCLEANFILES += clutter-version.h
+EXTRA_DIST += clutter-version.h.in clutter-version.h
+
+# key symbol update script
+EXTRA_DIST += clutter-keysyms-update.pl
+
+pc_files += mutter-clutter-$(CLUTTER_API_VERSION).pc
+
+# in order to be compatible with Clutter < 1.10, when we shipped a single
+# shared library whose name was determined by the single backend it
+# supported, we need to install symbolic links so that existing applications
+# using Clutter won't break in the Brave New World of multi-backend support
+# in the same shared object.
+compat_libs =
+
+# backends source listings
+#
+#   backend_source_c := source code
+#   backend_source_h := installed public headers
+#   backend_source_c_priv := source that should not be scanned by g-i
+#   backend_source_h_priv := private headers
+#   backend_source_built := built sources
+#
+backend_source_c =
+backend_source_h =
+backend_source_c_priv =
+backend_source_h_priv =
+backend_source_built =
+
+# X11 backend rules
+x11_source_c = \
+	x11/clutter-backend-x11.c		\
+	x11/clutter-device-manager-core-x11.c	\
+	x11/clutter-event-x11.c		\
+	x11/clutter-input-device-core-x11.c	\
+	x11/clutter-keymap-x11.c		\
+	x11/clutter-stage-x11.c		\
+	x11/clutter-x11-texture-pixmap.c	\
+	$(NULL)
+
+x11_source_h = \
+	x11/clutter-x11.h			\
+	x11/clutter-x11-texture-pixmap.h	\
+	$(NULL)
+
+x11_source_h_priv = \
+	x11/clutter-backend-x11.h		\
+	x11/clutter-device-manager-core-x11.h	\
+	x11/clutter-input-device-core-x11.h	\
+	x11/clutter-keymap-x11.h		\
+	x11/clutter-settings-x11.h		\
+	x11/clutter-stage-x11.h		\
+	$(NULL)
+
+x11_source_c_priv = \
+	x11/xsettings/xsettings-client.c	\
+	x11/xsettings/xsettings-client.h	\
+	x11/xsettings/xsettings-common.c	\
+	x11/xsettings/xsettings-common.h	\
+	$(NULL)
+
+x11_source_c += \
+	x11/clutter-device-manager-xi2.c	\
+	x11/clutter-input-device-xi2.c	\
+	$(NULL)
+
+x11_source_h_priv += \
+	x11/clutter-device-manager-xi2.h	\
+	x11/clutter-input-device-xi2.h	\
+	$(NULL)
+
+backend_source_h += $(x11_source_h)
+backend_source_c += $(x11_source_c)
+backend_source_h_priv += $(x11_source_h_priv)
+backend_source_c_priv += $(x11_source_c_priv)
+
+# the list of files we want to introspect on X11
+x11_introspection = $(x11_source_c) $(x11_source_h)
+
+clutterx11_includedir = $(clutter_includedir)/x11
+clutterx11_include_HEADERS = $(x11_source_h)
+
+mutter-clutter-x11-$(CLUTTER_API_VERSION).pc: mutter-clutter-$(CLUTTER_API_VERSION).pc
+	$(QUIET_GEN)cp -f $< $(@F)
+
+pc_files += mutter-clutter-x11-$(CLUTTER_API_VERSION).pc
+
+# Shared cogl backend files
+cogl_source_h =
+
+cogl_source_c = \
+	cogl/clutter-stage-cogl.c	\
+	$(NULL)
+
+cogl_source_h_priv = \
+	cogl/clutter-stage-cogl.h	\
+	$(NULL)
+
+cogl_source_c_priv =
+
+backend_source_h += $(cogl_source_h)
+backend_source_c += $(cogl_source_c)
+backend_source_h_priv += $(cogl_source_h_priv)
+backend_source_c_priv += $(cogl_source_c_priv)
+
+backend_source_h += $(glx_source_h)
+backend_source_c += $(glx_source_c)
+
+evdev_c_priv = \
+	evdev/clutter-device-manager-evdev.c	\
+	evdev/clutter-input-device-evdev.c	\
+	evdev/clutter-event-evdev.c		\
+	$(NULL)
+evdev_h_priv = \
+	evdev/clutter-device-manager-evdev.h	\
+	evdev/clutter-input-device-evdev.h	\
+	$(NULL)
+evdev_h = evdev/clutter-evdev.h
+
+backend_source_c_priv += $(evdev_c_priv)
+backend_source_h_priv += $(evdev_h_priv)
+backend_source_h += $(evdev_h)
+
+clutterevdev_includedir = $(clutter_includedir)/evdev
+clutterevdev_include_HEADERS = $(evdev_h)
+
+backend_source_c += evdev/clutter-xkb-utils.c
+backend_source_h_priv += evdev/clutter-xkb-utils.h
+
+# EGL backend rules
+egl_source_h = \
+	egl/clutter-egl-headers.h	\
+	egl/clutter-egl.h		\
+	$(NULL)
+
+egl_source_h_priv = egl/clutter-backend-eglnative.h egl/clutter-stage-eglnative.h
+egl_source_c = egl/clutter-backend-eglnative.c egl/clutter-stage-eglnative.c
+
+wayland_compositor_source_h = \
+	wayland/clutter-wayland-compositor.h		\
+	wayland/clutter-wayland-surface.h
+backend_source_h += $(wayland_compositor_source_h)
+backend_source_c += \
+	wayland/clutter-wayland-surface.c
+
+wayland_compositor_includedir = $(clutter_includedir)/wayland
+wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
+
+backend_source_h += $(egl_source_h)
+backend_source_c += $(egl_source_c)
+backend_source_h_priv += $(egl_source_h_priv)
+
+clutteregl_includedir = $(clutter_includedir)/egl
+clutteregl_include_HEADERS = $(egl_source_h)
+
+# cally
+cally_sources_h = \
+	cally/cally-actor.h		\
+	cally/cally-clone.h		\
+	cally/cally-factory.h		\
+	cally/cally-group.h		\
+	cally/cally.h			\
+	cally/cally-main.h		\
+	cally/cally-rectangle.h	\
+	cally/cally-root.h		\
+	cally/cally-stage.h		\
+	cally/cally-text.h		\
+	cally/cally-texture.h		\
+	cally/cally-util.h		\
+	$(NULL)
+
+cally_sources_c = \
+	cally/cally-actor.c		\
+	cally/cally.c			\
+	cally/cally-clone.c		\
+	cally/cally-group.c		\
+	cally/cally-rectangle.c	\
+	cally/cally-root.c		\
+	cally/cally-stage.c		\
+	cally/cally-text.c		\
+	cally/cally-texture.c		\
+	cally/cally-util.c		\
+	$(NULL)
+
+cally_sources_private = \
+	cally/cally-actor-private.h	\
+	$(NULL)
+
+cally_includedir = $(clutter_base_includedir)/cally
+cally_include_HEADERS = $(cally_sources_h)
+
+# general build rules:
+# you should not need to modify anything below this point
+
+# glib-genmarshal rules
+glib_marshal_list = clutter-marshal.list
+glib_marshal_prefix = _clutter_marshal
+include $(srcdir)/Makefile.am.marshal
+
+# glib-mkenums rules
+glib_enum_h = clutter-enum-types.h
+glib_enum_c = clutter-enum-types.c
+glib_enum_headers = $(source_h) $(deprecated_h)
+include $(srcdir)/Makefile.am.enums
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(pc_files)
+DISTCLEANFILES += $(pc_files)
+
+clutter_include_HEADERS = $(source_h) clutter.h clutter-version.h clutter-autocleanups.h
+nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
+
+clutter_deprecated_HEADERS = $(deprecated_h)
+
+mutterlibdir = $(libdir)/mutter
+mutterlib_LTLIBRARIES = libmutter-clutter-@CLUTTER_API_VERSION@.la
+
+libmutter_clutter_@CLUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(CLUTTER_LIBS)
+
+libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
+	$(backend_source_c) \
+	$(backend_source_h) \
+	$(backend_source_c_priv) \
+	$(backend_source_h_priv) \
+	$(source_c) \
+	$(source_h) \
+	$(source_c_priv) \
+	$(source_h_priv) \
+	$(deprecated_c) \
+	$(deprecated_h) \
+	$(deprecated_c_priv) \
+	$(deprecated_h_priv) \
+	$(cally_sources_c) \
+	$(cally_sources_h) \
+	$(cally_sources_private) \
+	$(NULL)
+
+nodist_libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \
+	$(backend_source_built) \
+	$(built_source_c) \
+	$(built_source_h)
+
+libmutter_clutter_@CLUTTER_API_VERSION@_la_LDFLAGS = \
+	$(CLUTTER_LINK_FLAGS) \
+	$(CLUTTER_LT_LDFLAGS) \
+	-export-dynamic \
+	-rpath $(mutterlibdir) \
+	$(NULL)
+
+install-exec-local:
+	test -z "$(mutterlibdir)" || $(MKDIR_P) "$(DESTDIR)$(mutterlibdir)"
+	for lib in `echo $(compat_libs)`; do \
+	  (cd $(DESTDIR)$(mutterlibdir) && \
+	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
+	  ) ; \
+	  (cd $(DESTDIR)$(mutterlibdir) && \
+	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
+	      { rm -f $$lib.0 && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
+	    } \
+	  ) ; \
+	  (cd $(DESTDIR)$(mutterlibdir) && \
+	    { ln -s -f libmutter-clutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
+	      { rm -f $$lib && ln -s libmutter-clutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
+	    } \
+	  ) ; \
+	done
+
+# gobject-introspection rules
+-include $(INTROSPECTION_MAKEFILE)
+
+Clutter-@CLUTTER_API_VERSION@.gir: libmutter-clutter-@CLUTTER_API_VERSION@.la Makefile
+
+Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter
+Clutter_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
+Clutter_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \
+	$(clutter_include_HEADERS) \
+	$(clutter_deprecated_HEADERS) \
+	$(nodist_clutter_include_HEADERS) \
+	$(source_c) \
+	$(deprecated_c) \
+	$(built_source_c)
+Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0
+Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
+	--warn-all \
+	--c-include='clutter/clutter.h' \
+	--pkg-export=clutter-@CLUTTER_API_VERSION@
+
+INTROSPECTION_GIRS += Clutter-@CLUTTER_API_VERSION@.gir
+
+Cally-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
+
+Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
+Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
+Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
+	--warn-all \
+	--c-include='cally/cally.h' \
+	--pkg-export=cally-@CLUTTER_API_VERSION@ \
+	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
+
+INTROSPECTION_GIRS += Cally-@CLUTTER_API_VERSION@.gir
+
+ClutterX11-@CLUTTER_API_VERSION@.gir: Makefile Clutter-@CLUTTER_API_VERSION@.gir
+
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = ClutterX11
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libmutter-clutter-@CLUTTER_API_VERSION@.la
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
+	--warn-all \
+	--c-include='clutter/x11/clutter-x11.h' \
+	--pkg-export=clutter-x11-@CLUTTER_API_VERSION@ \
+	--include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir
+
+INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir
+
+# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
+# install anything - we need to install inside our prefix.
+girdir = $(mutterlibdir)
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(mutterlibdir)
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+EXTRA_DIST += \
+	Makefile.am.marshal	\
+	Makefile.am.enums
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/clutter/Makefile.am.enums b/clutter/clutter/Makefile.am.enums
similarity index 100%
rename from clutter/Makefile.am.enums
rename to clutter/clutter/Makefile.am.enums
diff --git a/clutter/Makefile.am.marshal b/clutter/clutter/Makefile.am.marshal
similarity index 100%
rename from clutter/Makefile.am.marshal
rename to clutter/clutter/Makefile.am.marshal
diff --git a/clutter/cally/ChangeLog.pre-cally-merge b/clutter/clutter/cally/ChangeLog.pre-cally-merge
similarity index 100%
rename from clutter/cally/ChangeLog.pre-cally-merge
rename to clutter/clutter/cally/ChangeLog.pre-cally-merge
diff --git a/clutter/cally/cally-actor-private.h b/clutter/clutter/cally/cally-actor-private.h
similarity index 100%
rename from clutter/cally/cally-actor-private.h
rename to clutter/clutter/cally/cally-actor-private.h
diff --git a/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c
similarity index 100%
rename from clutter/cally/cally-actor.c
rename to clutter/clutter/cally/cally-actor.c
diff --git a/clutter/cally/cally-actor.h b/clutter/clutter/cally/cally-actor.h
similarity index 100%
rename from clutter/cally/cally-actor.h
rename to clutter/clutter/cally/cally-actor.h
diff --git a/clutter/cally/cally-clone.c b/clutter/clutter/cally/cally-clone.c
similarity index 100%
rename from clutter/cally/cally-clone.c
rename to clutter/clutter/cally/cally-clone.c
diff --git a/clutter/cally/cally-clone.h b/clutter/clutter/cally/cally-clone.h
similarity index 100%
rename from clutter/cally/cally-clone.h
rename to clutter/clutter/cally/cally-clone.h
diff --git a/clutter/cally/cally-factory.h b/clutter/clutter/cally/cally-factory.h
similarity index 100%
rename from clutter/cally/cally-factory.h
rename to clutter/clutter/cally/cally-factory.h
diff --git a/clutter/cally/cally-group.c b/clutter/clutter/cally/cally-group.c
similarity index 100%
rename from clutter/cally/cally-group.c
rename to clutter/clutter/cally/cally-group.c
diff --git a/clutter/cally/cally-group.h b/clutter/clutter/cally/cally-group.h
similarity index 100%
rename from clutter/cally/cally-group.h
rename to clutter/clutter/cally/cally-group.h
diff --git a/clutter/cally/cally-main.h b/clutter/clutter/cally/cally-main.h
similarity index 100%
rename from clutter/cally/cally-main.h
rename to clutter/clutter/cally/cally-main.h
diff --git a/clutter/cally/cally-rectangle.c b/clutter/clutter/cally/cally-rectangle.c
similarity index 100%
rename from clutter/cally/cally-rectangle.c
rename to clutter/clutter/cally/cally-rectangle.c
diff --git a/clutter/cally/cally-rectangle.h b/clutter/clutter/cally/cally-rectangle.h
similarity index 100%
rename from clutter/cally/cally-rectangle.h
rename to clutter/clutter/cally/cally-rectangle.h
diff --git a/clutter/cally/cally-root.c b/clutter/clutter/cally/cally-root.c
similarity index 100%
rename from clutter/cally/cally-root.c
rename to clutter/clutter/cally/cally-root.c
diff --git a/clutter/cally/cally-root.h b/clutter/clutter/cally/cally-root.h
similarity index 100%
rename from clutter/cally/cally-root.h
rename to clutter/clutter/cally/cally-root.h
diff --git a/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c
similarity index 100%
rename from clutter/cally/cally-stage.c
rename to clutter/clutter/cally/cally-stage.c
diff --git a/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h
similarity index 100%
rename from clutter/cally/cally-stage.h
rename to clutter/clutter/cally/cally-stage.h
diff --git a/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c
similarity index 100%
rename from clutter/cally/cally-text.c
rename to clutter/clutter/cally/cally-text.c
diff --git a/clutter/cally/cally-text.h b/clutter/clutter/cally/cally-text.h
similarity index 100%
rename from clutter/cally/cally-text.h
rename to clutter/clutter/cally/cally-text.h
diff --git a/clutter/cally/cally-texture.c b/clutter/clutter/cally/cally-texture.c
similarity index 100%
rename from clutter/cally/cally-texture.c
rename to clutter/clutter/cally/cally-texture.c
diff --git a/clutter/cally/cally-texture.h b/clutter/clutter/cally/cally-texture.h
similarity index 100%
rename from clutter/cally/cally-texture.h
rename to clutter/clutter/cally/cally-texture.h
diff --git a/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c
similarity index 100%
rename from clutter/cally/cally-util.c
rename to clutter/clutter/cally/cally-util.c
diff --git a/clutter/cally/cally-util.h b/clutter/clutter/cally/cally-util.h
similarity index 100%
rename from clutter/cally/cally-util.h
rename to clutter/clutter/cally/cally-util.h
diff --git a/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
similarity index 100%
rename from clutter/cally/cally.c
rename to clutter/clutter/cally/cally.c
diff --git a/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
similarity index 100%
rename from clutter/cally/cally.h
rename to clutter/clutter/cally/cally.h
diff --git a/clutter/clutter-action.c b/clutter/clutter/clutter-action.c
similarity index 100%
rename from clutter/clutter-action.c
rename to clutter/clutter/clutter-action.c
diff --git a/clutter/clutter-action.h b/clutter/clutter/clutter-action.h
similarity index 100%
rename from clutter/clutter-action.h
rename to clutter/clutter/clutter-action.h
diff --git a/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c
similarity index 100%
rename from clutter/clutter-actor-box.c
rename to clutter/clutter/clutter-actor-box.c
diff --git a/clutter/clutter-actor-meta-private.h b/clutter/clutter/clutter-actor-meta-private.h
similarity index 100%
rename from clutter/clutter-actor-meta-private.h
rename to clutter/clutter/clutter-actor-meta-private.h
diff --git a/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c
similarity index 100%
rename from clutter/clutter-actor-meta.c
rename to clutter/clutter/clutter-actor-meta.c
diff --git a/clutter/clutter-actor-meta.h b/clutter/clutter/clutter-actor-meta.h
similarity index 100%
rename from clutter/clutter-actor-meta.h
rename to clutter/clutter/clutter-actor-meta.h
diff --git a/clutter/clutter-actor-private.h b/clutter/clutter/clutter-actor-private.h
similarity index 100%
rename from clutter/clutter-actor-private.h
rename to clutter/clutter/clutter-actor-private.h
diff --git a/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
similarity index 100%
rename from clutter/clutter-actor.c
rename to clutter/clutter/clutter-actor.c
diff --git a/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
similarity index 100%
rename from clutter/clutter-actor.h
rename to clutter/clutter/clutter-actor.h
diff --git a/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c
similarity index 100%
rename from clutter/clutter-align-constraint.c
rename to clutter/clutter/clutter-align-constraint.c
diff --git a/clutter/clutter-align-constraint.h b/clutter/clutter/clutter-align-constraint.h
similarity index 100%
rename from clutter/clutter-align-constraint.h
rename to clutter/clutter/clutter-align-constraint.h
diff --git a/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c
similarity index 100%
rename from clutter/clutter-animatable.c
rename to clutter/clutter/clutter-animatable.c
diff --git a/clutter/clutter-animatable.h b/clutter/clutter/clutter-animatable.h
similarity index 100%
rename from clutter/clutter-animatable.h
rename to clutter/clutter/clutter-animatable.h
diff --git a/clutter/clutter-autocleanups.h b/clutter/clutter/clutter-autocleanups.h
similarity index 100%
rename from clutter/clutter-autocleanups.h
rename to clutter/clutter/clutter-autocleanups.h
diff --git a/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h
similarity index 100%
rename from clutter/clutter-backend-private.h
rename to clutter/clutter/clutter-backend-private.h
diff --git a/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
similarity index 100%
rename from clutter/clutter-backend.c
rename to clutter/clutter/clutter-backend.c
diff --git a/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h
similarity index 100%
rename from clutter/clutter-backend.h
rename to clutter/clutter/clutter-backend.h
diff --git a/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c
similarity index 100%
rename from clutter/clutter-base-types.c
rename to clutter/clutter/clutter-base-types.c
diff --git a/clutter/clutter-bezier.c b/clutter/clutter/clutter-bezier.c
similarity index 100%
rename from clutter/clutter-bezier.c
rename to clutter/clutter/clutter-bezier.c
diff --git a/clutter/clutter-bezier.h b/clutter/clutter/clutter-bezier.h
similarity index 100%
rename from clutter/clutter-bezier.h
rename to clutter/clutter/clutter-bezier.h
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter/clutter-bin-layout.c
similarity index 100%
rename from clutter/clutter-bin-layout.c
rename to clutter/clutter/clutter-bin-layout.c
diff --git a/clutter/clutter-bin-layout.h b/clutter/clutter/clutter-bin-layout.h
similarity index 100%
rename from clutter/clutter-bin-layout.h
rename to clutter/clutter/clutter-bin-layout.h
diff --git a/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c
similarity index 100%
rename from clutter/clutter-bind-constraint.c
rename to clutter/clutter/clutter-bind-constraint.c
diff --git a/clutter/clutter-bind-constraint.h b/clutter/clutter/clutter-bind-constraint.h
similarity index 100%
rename from clutter/clutter-bind-constraint.h
rename to clutter/clutter/clutter-bind-constraint.h
diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c
similarity index 100%
rename from clutter/clutter-binding-pool.c
rename to clutter/clutter/clutter-binding-pool.c
diff --git a/clutter/clutter-binding-pool.h b/clutter/clutter/clutter-binding-pool.h
similarity index 100%
rename from clutter/clutter-binding-pool.h
rename to clutter/clutter/clutter-binding-pool.h
diff --git a/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c
similarity index 100%
rename from clutter/clutter-blur-effect.c
rename to clutter/clutter/clutter-blur-effect.c
diff --git a/clutter/clutter-blur-effect.h b/clutter/clutter/clutter-blur-effect.h
similarity index 100%
rename from clutter/clutter-blur-effect.h
rename to clutter/clutter/clutter-blur-effect.h
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c
similarity index 100%
rename from clutter/clutter-box-layout.c
rename to clutter/clutter/clutter-box-layout.c
diff --git a/clutter/clutter-box-layout.h b/clutter/clutter/clutter-box-layout.h
similarity index 100%
rename from clutter/clutter-box-layout.h
rename to clutter/clutter/clutter-box-layout.h
diff --git a/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c
similarity index 100%
rename from clutter/clutter-brightness-contrast-effect.c
rename to clutter/clutter/clutter-brightness-contrast-effect.c
diff --git a/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter/clutter-brightness-contrast-effect.h
similarity index 100%
rename from clutter/clutter-brightness-contrast-effect.h
rename to clutter/clutter/clutter-brightness-contrast-effect.h
diff --git a/clutter/clutter-cairo.c b/clutter/clutter/clutter-cairo.c
similarity index 100%
rename from clutter/clutter-cairo.c
rename to clutter/clutter/clutter-cairo.c
diff --git a/clutter/clutter-cairo.h b/clutter/clutter/clutter-cairo.h
similarity index 100%
rename from clutter/clutter-cairo.h
rename to clutter/clutter/clutter-cairo.h
diff --git a/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
similarity index 100%
rename from clutter/clutter-canvas.c
rename to clutter/clutter/clutter-canvas.c
diff --git a/clutter/clutter-canvas.h b/clutter/clutter/clutter-canvas.h
similarity index 100%
rename from clutter/clutter-canvas.h
rename to clutter/clutter/clutter-canvas.h
diff --git a/clutter/clutter-child-meta.c b/clutter/clutter/clutter-child-meta.c
similarity index 100%
rename from clutter/clutter-child-meta.c
rename to clutter/clutter/clutter-child-meta.c
diff --git a/clutter/clutter-child-meta.h b/clutter/clutter/clutter-child-meta.h
similarity index 100%
rename from clutter/clutter-child-meta.h
rename to clutter/clutter/clutter-child-meta.h
diff --git a/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c
similarity index 100%
rename from clutter/clutter-click-action.c
rename to clutter/clutter/clutter-click-action.c
diff --git a/clutter/clutter-click-action.h b/clutter/clutter/clutter-click-action.h
similarity index 100%
rename from clutter/clutter-click-action.h
rename to clutter/clutter/clutter-click-action.h
diff --git a/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
similarity index 100%
rename from clutter/clutter-clone.c
rename to clutter/clutter/clutter-clone.c
diff --git a/clutter/clutter-clone.h b/clutter/clutter/clutter-clone.h
similarity index 100%
rename from clutter/clutter-clone.h
rename to clutter/clutter/clutter-clone.h
diff --git a/clutter/clutter-cogl-compat.h b/clutter/clutter/clutter-cogl-compat.h
similarity index 100%
rename from clutter/clutter-cogl-compat.h
rename to clutter/clutter/clutter-cogl-compat.h
diff --git a/clutter/clutter-color-static.h b/clutter/clutter/clutter-color-static.h
similarity index 100%
rename from clutter/clutter-color-static.h
rename to clutter/clutter/clutter-color-static.h
diff --git a/clutter/clutter-color.c b/clutter/clutter/clutter-color.c
similarity index 100%
rename from clutter/clutter-color.c
rename to clutter/clutter/clutter-color.c
diff --git a/clutter/clutter-color.h b/clutter/clutter/clutter-color.h
similarity index 100%
rename from clutter/clutter-color.h
rename to clutter/clutter/clutter-color.h
diff --git a/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c
similarity index 100%
rename from clutter/clutter-colorize-effect.c
rename to clutter/clutter/clutter-colorize-effect.c
diff --git a/clutter/clutter-colorize-effect.h b/clutter/clutter/clutter-colorize-effect.h
similarity index 100%
rename from clutter/clutter-colorize-effect.h
rename to clutter/clutter/clutter-colorize-effect.h
diff --git a/clutter/clutter-config.h.in b/clutter/clutter/clutter-config.h.in
similarity index 100%
rename from clutter/clutter-config.h.in
rename to clutter/clutter/clutter-config.h.in
diff --git a/clutter/clutter-constraint-private.h b/clutter/clutter/clutter-constraint-private.h
similarity index 100%
rename from clutter/clutter-constraint-private.h
rename to clutter/clutter/clutter-constraint-private.h
diff --git a/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
similarity index 100%
rename from clutter/clutter-constraint.c
rename to clutter/clutter/clutter-constraint.c
diff --git a/clutter/clutter-constraint.h b/clutter/clutter/clutter-constraint.h
similarity index 100%
rename from clutter/clutter-constraint.h
rename to clutter/clutter/clutter-constraint.h
diff --git a/clutter/clutter-container.c b/clutter/clutter/clutter-container.c
similarity index 100%
rename from clutter/clutter-container.c
rename to clutter/clutter/clutter-container.c
diff --git a/clutter/clutter-container.h b/clutter/clutter/clutter-container.h
similarity index 100%
rename from clutter/clutter-container.h
rename to clutter/clutter/clutter-container.h
diff --git a/clutter/clutter-content-private.h b/clutter/clutter/clutter-content-private.h
similarity index 100%
rename from clutter/clutter-content-private.h
rename to clutter/clutter/clutter-content-private.h
diff --git a/clutter/clutter-content.c b/clutter/clutter/clutter-content.c
similarity index 100%
rename from clutter/clutter-content.c
rename to clutter/clutter/clutter-content.c
diff --git a/clutter/clutter-content.h b/clutter/clutter/clutter-content.h
similarity index 100%
rename from clutter/clutter-content.h
rename to clutter/clutter/clutter-content.h
diff --git a/clutter/clutter-debug.h b/clutter/clutter/clutter-debug.h
similarity index 100%
rename from clutter/clutter-debug.h
rename to clutter/clutter/clutter-debug.h
diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c
similarity index 100%
rename from clutter/clutter-deform-effect.c
rename to clutter/clutter/clutter-deform-effect.c
diff --git a/clutter/clutter-deform-effect.h b/clutter/clutter/clutter-deform-effect.h
similarity index 100%
rename from clutter/clutter-deform-effect.h
rename to clutter/clutter/clutter-deform-effect.h
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
similarity index 100%
rename from clutter/clutter-deprecated.h
rename to clutter/clutter/clutter-deprecated.h
diff --git a/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c
similarity index 100%
rename from clutter/clutter-desaturate-effect.c
rename to clutter/clutter/clutter-desaturate-effect.c
diff --git a/clutter/clutter-desaturate-effect.h b/clutter/clutter/clutter-desaturate-effect.h
similarity index 100%
rename from clutter/clutter-desaturate-effect.h
rename to clutter/clutter/clutter-desaturate-effect.h
diff --git a/clutter/clutter-device-manager-private.h b/clutter/clutter/clutter-device-manager-private.h
similarity index 100%
rename from clutter/clutter-device-manager-private.h
rename to clutter/clutter/clutter-device-manager-private.h
diff --git a/clutter/clutter-device-manager.c b/clutter/clutter/clutter-device-manager.c
similarity index 100%
rename from clutter/clutter-device-manager.c
rename to clutter/clutter/clutter-device-manager.c
diff --git a/clutter/clutter-device-manager.h b/clutter/clutter/clutter-device-manager.h
similarity index 100%
rename from clutter/clutter-device-manager.h
rename to clutter/clutter/clutter-device-manager.h
diff --git a/clutter/clutter-drag-action.c b/clutter/clutter/clutter-drag-action.c
similarity index 100%
rename from clutter/clutter-drag-action.c
rename to clutter/clutter/clutter-drag-action.c
diff --git a/clutter/clutter-drag-action.h b/clutter/clutter/clutter-drag-action.h
similarity index 100%
rename from clutter/clutter-drag-action.h
rename to clutter/clutter/clutter-drag-action.h
diff --git a/clutter/clutter-drop-action.c b/clutter/clutter/clutter-drop-action.c
similarity index 100%
rename from clutter/clutter-drop-action.c
rename to clutter/clutter/clutter-drop-action.c
diff --git a/clutter/clutter-drop-action.h b/clutter/clutter/clutter-drop-action.h
similarity index 100%
rename from clutter/clutter-drop-action.h
rename to clutter/clutter/clutter-drop-action.h
diff --git a/clutter/clutter-easing.c b/clutter/clutter/clutter-easing.c
similarity index 100%
rename from clutter/clutter-easing.c
rename to clutter/clutter/clutter-easing.c
diff --git a/clutter/clutter-easing.h b/clutter/clutter/clutter-easing.h
similarity index 100%
rename from clutter/clutter-easing.h
rename to clutter/clutter/clutter-easing.h
diff --git a/clutter/clutter-effect-private.h b/clutter/clutter/clutter-effect-private.h
similarity index 100%
rename from clutter/clutter-effect-private.h
rename to clutter/clutter/clutter-effect-private.h
diff --git a/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c
similarity index 100%
rename from clutter/clutter-effect.c
rename to clutter/clutter/clutter-effect.c
diff --git a/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h
similarity index 100%
rename from clutter/clutter-effect.h
rename to clutter/clutter/clutter-effect.h
diff --git a/clutter/clutter-enum-types.c.in b/clutter/clutter/clutter-enum-types.c.in
similarity index 100%
rename from clutter/clutter-enum-types.c.in
rename to clutter/clutter/clutter-enum-types.c.in
diff --git a/clutter/clutter-enum-types.h.in b/clutter/clutter/clutter-enum-types.h.in
similarity index 100%
rename from clutter/clutter-enum-types.h.in
rename to clutter/clutter/clutter-enum-types.h.in
diff --git a/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
similarity index 100%
rename from clutter/clutter-enums.h
rename to clutter/clutter/clutter-enums.h
diff --git a/clutter/clutter-event-private.h b/clutter/clutter/clutter-event-private.h
similarity index 100%
rename from clutter/clutter-event-private.h
rename to clutter/clutter/clutter-event-private.h
diff --git a/clutter/clutter-event-translator.c b/clutter/clutter/clutter-event-translator.c
similarity index 100%
rename from clutter/clutter-event-translator.c
rename to clutter/clutter/clutter-event-translator.c
diff --git a/clutter/clutter-event-translator.h b/clutter/clutter/clutter-event-translator.h
similarity index 100%
rename from clutter/clutter-event-translator.h
rename to clutter/clutter/clutter-event-translator.h
diff --git a/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
similarity index 100%
rename from clutter/clutter-event.c
rename to clutter/clutter/clutter-event.c
diff --git a/clutter/clutter-event.h b/clutter/clutter/clutter-event.h
similarity index 100%
rename from clutter/clutter-event.h
rename to clutter/clutter/clutter-event.h
diff --git a/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c
similarity index 100%
rename from clutter/clutter-feature.c
rename to clutter/clutter/clutter-feature.c
diff --git a/clutter/clutter-feature.h b/clutter/clutter/clutter-feature.h
similarity index 100%
rename from clutter/clutter-feature.h
rename to clutter/clutter/clutter-feature.h
diff --git a/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c
similarity index 100%
rename from clutter/clutter-fixed-layout.c
rename to clutter/clutter/clutter-fixed-layout.c
diff --git a/clutter/clutter-fixed-layout.h b/clutter/clutter/clutter-fixed-layout.h
similarity index 100%
rename from clutter/clutter-fixed-layout.h
rename to clutter/clutter/clutter-fixed-layout.h
diff --git a/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c
similarity index 100%
rename from clutter/clutter-flatten-effect.c
rename to clutter/clutter/clutter-flatten-effect.c
diff --git a/clutter/clutter-flatten-effect.h b/clutter/clutter/clutter-flatten-effect.h
similarity index 100%
rename from clutter/clutter-flatten-effect.h
rename to clutter/clutter/clutter-flatten-effect.h
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c
similarity index 100%
rename from clutter/clutter-flow-layout.c
rename to clutter/clutter/clutter-flow-layout.c
diff --git a/clutter/clutter-flow-layout.h b/clutter/clutter/clutter-flow-layout.h
similarity index 100%
rename from clutter/clutter-flow-layout.h
rename to clutter/clutter/clutter-flow-layout.h
diff --git a/clutter/clutter-gesture-action-private.h b/clutter/clutter/clutter-gesture-action-private.h
similarity index 100%
rename from clutter/clutter-gesture-action-private.h
rename to clutter/clutter/clutter-gesture-action-private.h
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c
similarity index 100%
rename from clutter/clutter-gesture-action.c
rename to clutter/clutter/clutter-gesture-action.c
diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter/clutter-gesture-action.h
similarity index 100%
rename from clutter/clutter-gesture-action.h
rename to clutter/clutter/clutter-gesture-action.h
diff --git a/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
similarity index 100%
rename from clutter/clutter-grid-layout.c
rename to clutter/clutter/clutter-grid-layout.c
diff --git a/clutter/clutter-grid-layout.h b/clutter/clutter/clutter-grid-layout.h
similarity index 100%
rename from clutter/clutter-grid-layout.h
rename to clutter/clutter/clutter-grid-layout.h
diff --git a/clutter/clutter-group.h b/clutter/clutter/clutter-group.h
similarity index 100%
rename from clutter/clutter-group.h
rename to clutter/clutter/clutter-group.h
diff --git a/clutter/clutter-id-pool.c b/clutter/clutter/clutter-id-pool.c
similarity index 100%
rename from clutter/clutter-id-pool.c
rename to clutter/clutter/clutter-id-pool.c
diff --git a/clutter/clutter-id-pool.h b/clutter/clutter/clutter-id-pool.h
similarity index 100%
rename from clutter/clutter-id-pool.h
rename to clutter/clutter/clutter-id-pool.h
diff --git a/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
similarity index 100%
rename from clutter/clutter-image.c
rename to clutter/clutter/clutter-image.c
diff --git a/clutter/clutter-image.h b/clutter/clutter/clutter-image.h
similarity index 100%
rename from clutter/clutter-image.h
rename to clutter/clutter/clutter-image.h
diff --git a/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
similarity index 100%
rename from clutter/clutter-input-device.c
rename to clutter/clutter/clutter-input-device.c
diff --git a/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
similarity index 100%
rename from clutter/clutter-input-device.h
rename to clutter/clutter/clutter-input-device.h
diff --git a/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c
similarity index 100%
rename from clutter/clutter-interval.c
rename to clutter/clutter/clutter-interval.c
diff --git a/clutter/clutter-interval.h b/clutter/clutter/clutter-interval.h
similarity index 100%
rename from clutter/clutter-interval.h
rename to clutter/clutter/clutter-interval.h
diff --git a/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c
similarity index 100%
rename from clutter/clutter-keyframe-transition.c
rename to clutter/clutter/clutter-keyframe-transition.c
diff --git a/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h
similarity index 100%
rename from clutter/clutter-keyframe-transition.h
rename to clutter/clutter/clutter-keyframe-transition.h
diff --git a/clutter/clutter-keysyms-table.c b/clutter/clutter/clutter-keysyms-table.c
similarity index 100%
rename from clutter/clutter-keysyms-table.c
rename to clutter/clutter/clutter-keysyms-table.c
diff --git a/clutter/clutter-keysyms-update.pl b/clutter/clutter/clutter-keysyms-update.pl
similarity index 100%
rename from clutter/clutter-keysyms-update.pl
rename to clutter/clutter/clutter-keysyms-update.pl
diff --git a/clutter/clutter-keysyms.h b/clutter/clutter/clutter-keysyms.h
similarity index 100%
rename from clutter/clutter-keysyms.h
rename to clutter/clutter/clutter-keysyms.h
diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
similarity index 100%
rename from clutter/clutter-layout-manager.c
rename to clutter/clutter/clutter-layout-manager.c
diff --git a/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h
similarity index 100%
rename from clutter/clutter-layout-manager.h
rename to clutter/clutter/clutter-layout-manager.h
diff --git a/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c
similarity index 100%
rename from clutter/clutter-layout-meta.c
rename to clutter/clutter/clutter-layout-meta.c
diff --git a/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h
similarity index 100%
rename from clutter/clutter-layout-meta.h
rename to clutter/clutter/clutter-layout-meta.h
diff --git a/clutter/clutter-macros.h b/clutter/clutter/clutter-macros.h
similarity index 100%
rename from clutter/clutter-macros.h
rename to clutter/clutter/clutter-macros.h
diff --git a/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
similarity index 100%
rename from clutter/clutter-main.c
rename to clutter/clutter/clutter-main.c
diff --git a/clutter/clutter-main.h b/clutter/clutter/clutter-main.h
similarity index 100%
rename from clutter/clutter-main.h
rename to clutter/clutter/clutter-main.h
diff --git a/clutter/clutter-marshal.list b/clutter/clutter/clutter-marshal.list
similarity index 100%
rename from clutter/clutter-marshal.list
rename to clutter/clutter/clutter-marshal.list
diff --git a/clutter/clutter-master-clock-default.c b/clutter/clutter/clutter-master-clock-default.c
similarity index 100%
rename from clutter/clutter-master-clock-default.c
rename to clutter/clutter/clutter-master-clock-default.c
diff --git a/clutter/clutter-master-clock-default.h b/clutter/clutter/clutter-master-clock-default.h
similarity index 100%
rename from clutter/clutter-master-clock-default.h
rename to clutter/clutter/clutter-master-clock-default.h
diff --git a/clutter/clutter-master-clock.c b/clutter/clutter/clutter-master-clock.c
similarity index 100%
rename from clutter/clutter-master-clock.c
rename to clutter/clutter/clutter-master-clock.c
diff --git a/clutter/clutter-master-clock.h b/clutter/clutter/clutter-master-clock.h
similarity index 100%
rename from clutter/clutter-master-clock.h
rename to clutter/clutter/clutter-master-clock.h
diff --git a/clutter/clutter-offscreen-effect-private.h b/clutter/clutter/clutter-offscreen-effect-private.h
similarity index 100%
rename from clutter/clutter-offscreen-effect-private.h
rename to clutter/clutter/clutter-offscreen-effect-private.h
diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
similarity index 100%
rename from clutter/clutter-offscreen-effect.c
rename to clutter/clutter/clutter-offscreen-effect.c
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h
similarity index 100%
rename from clutter/clutter-offscreen-effect.h
rename to clutter/clutter/clutter-offscreen-effect.h
diff --git a/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c
similarity index 100%
rename from clutter/clutter-page-turn-effect.c
rename to clutter/clutter/clutter-page-turn-effect.c
diff --git a/clutter/clutter-page-turn-effect.h b/clutter/clutter/clutter-page-turn-effect.h
similarity index 100%
rename from clutter/clutter-page-turn-effect.h
rename to clutter/clutter/clutter-page-turn-effect.h
diff --git a/clutter/clutter-paint-node-private.h b/clutter/clutter/clutter-paint-node-private.h
similarity index 100%
rename from clutter/clutter-paint-node-private.h
rename to clutter/clutter/clutter-paint-node-private.h
diff --git a/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c
similarity index 100%
rename from clutter/clutter-paint-node.c
rename to clutter/clutter/clutter-paint-node.c
diff --git a/clutter/clutter-paint-node.h b/clutter/clutter/clutter-paint-node.h
similarity index 100%
rename from clutter/clutter-paint-node.h
rename to clutter/clutter/clutter-paint-node.h
diff --git a/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
similarity index 100%
rename from clutter/clutter-paint-nodes.c
rename to clutter/clutter/clutter-paint-nodes.c
diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter/clutter-paint-nodes.h
similarity index 100%
rename from clutter/clutter-paint-nodes.h
rename to clutter/clutter/clutter-paint-nodes.h
diff --git a/clutter/clutter-paint-volume-private.h b/clutter/clutter/clutter-paint-volume-private.h
similarity index 100%
rename from clutter/clutter-paint-volume-private.h
rename to clutter/clutter/clutter-paint-volume-private.h
diff --git a/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c
similarity index 100%
rename from clutter/clutter-paint-volume.c
rename to clutter/clutter/clutter-paint-volume.c
diff --git a/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c
similarity index 100%
rename from clutter/clutter-pan-action.c
rename to clutter/clutter/clutter-pan-action.c
diff --git a/clutter/clutter-pan-action.h b/clutter/clutter/clutter-pan-action.h
similarity index 100%
rename from clutter/clutter-pan-action.h
rename to clutter/clutter/clutter-pan-action.h
diff --git a/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c
similarity index 100%
rename from clutter/clutter-path-constraint.c
rename to clutter/clutter/clutter-path-constraint.c
diff --git a/clutter/clutter-path-constraint.h b/clutter/clutter/clutter-path-constraint.h
similarity index 100%
rename from clutter/clutter-path-constraint.h
rename to clutter/clutter/clutter-path-constraint.h
diff --git a/clutter/clutter-path.c b/clutter/clutter/clutter-path.c
similarity index 100%
rename from clutter/clutter-path.c
rename to clutter/clutter/clutter-path.c
diff --git a/clutter/clutter-path.h b/clutter/clutter/clutter-path.h
similarity index 100%
rename from clutter/clutter-path.h
rename to clutter/clutter/clutter-path.h
diff --git a/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
similarity index 100%
rename from clutter/clutter-private.h
rename to clutter/clutter/clutter-private.h
diff --git a/clutter/clutter-property-transition.c b/clutter/clutter/clutter-property-transition.c
similarity index 100%
rename from clutter/clutter-property-transition.c
rename to clutter/clutter/clutter-property-transition.c
diff --git a/clutter/clutter-property-transition.h b/clutter/clutter/clutter-property-transition.h
similarity index 100%
rename from clutter/clutter-property-transition.h
rename to clutter/clutter/clutter-property-transition.h
diff --git a/clutter/clutter-rotate-action.c b/clutter/clutter/clutter-rotate-action.c
similarity index 100%
rename from clutter/clutter-rotate-action.c
rename to clutter/clutter/clutter-rotate-action.c
diff --git a/clutter/clutter-rotate-action.h b/clutter/clutter/clutter-rotate-action.h
similarity index 100%
rename from clutter/clutter-rotate-action.h
rename to clutter/clutter/clutter-rotate-action.h
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c
similarity index 100%
rename from clutter/clutter-script-parser.c
rename to clutter/clutter/clutter-script-parser.c
diff --git a/clutter/clutter-script-private.h b/clutter/clutter/clutter-script-private.h
similarity index 100%
rename from clutter/clutter-script-private.h
rename to clutter/clutter/clutter-script-private.h
diff --git a/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
similarity index 100%
rename from clutter/clutter-script.c
rename to clutter/clutter/clutter-script.c
diff --git a/clutter/clutter-script.h b/clutter/clutter/clutter-script.h
similarity index 100%
rename from clutter/clutter-script.h
rename to clutter/clutter/clutter-script.h
diff --git a/clutter/clutter-scriptable.c b/clutter/clutter/clutter-scriptable.c
similarity index 100%
rename from clutter/clutter-scriptable.c
rename to clutter/clutter/clutter-scriptable.c
diff --git a/clutter/clutter-scriptable.h b/clutter/clutter/clutter-scriptable.h
similarity index 100%
rename from clutter/clutter-scriptable.h
rename to clutter/clutter/clutter-scriptable.h
diff --git a/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c
similarity index 100%
rename from clutter/clutter-scroll-actor.c
rename to clutter/clutter/clutter-scroll-actor.c
diff --git a/clutter/clutter-scroll-actor.h b/clutter/clutter/clutter-scroll-actor.h
similarity index 100%
rename from clutter/clutter-scroll-actor.h
rename to clutter/clutter/clutter-scroll-actor.h
diff --git a/clutter/clutter-settings-private.h b/clutter/clutter/clutter-settings-private.h
similarity index 100%
rename from clutter/clutter-settings-private.h
rename to clutter/clutter/clutter-settings-private.h
diff --git a/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c
similarity index 100%
rename from clutter/clutter-settings.c
rename to clutter/clutter/clutter-settings.c
diff --git a/clutter/clutter-settings.h b/clutter/clutter/clutter-settings.h
similarity index 100%
rename from clutter/clutter-settings.h
rename to clutter/clutter/clutter-settings.h
diff --git a/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
similarity index 100%
rename from clutter/clutter-shader-effect.c
rename to clutter/clutter/clutter-shader-effect.c
diff --git a/clutter/clutter-shader-effect.h b/clutter/clutter/clutter-shader-effect.h
similarity index 100%
rename from clutter/clutter-shader-effect.h
rename to clutter/clutter/clutter-shader-effect.h
diff --git a/clutter/clutter-shader-types.c b/clutter/clutter/clutter-shader-types.c
similarity index 100%
rename from clutter/clutter-shader-types.c
rename to clutter/clutter/clutter-shader-types.c
diff --git a/clutter/clutter-shader-types.h b/clutter/clutter/clutter-shader-types.h
similarity index 100%
rename from clutter/clutter-shader-types.h
rename to clutter/clutter/clutter-shader-types.h
diff --git a/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c
similarity index 100%
rename from clutter/clutter-snap-constraint.c
rename to clutter/clutter/clutter-snap-constraint.c
diff --git a/clutter/clutter-snap-constraint.h b/clutter/clutter/clutter-snap-constraint.h
similarity index 100%
rename from clutter/clutter-snap-constraint.h
rename to clutter/clutter/clutter-snap-constraint.h
diff --git a/clutter/clutter-stage-manager-private.h b/clutter/clutter/clutter-stage-manager-private.h
similarity index 100%
rename from clutter/clutter-stage-manager-private.h
rename to clutter/clutter/clutter-stage-manager-private.h
diff --git a/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c
similarity index 100%
rename from clutter/clutter-stage-manager.c
rename to clutter/clutter/clutter-stage-manager.c
diff --git a/clutter/clutter-stage-manager.h b/clutter/clutter/clutter-stage-manager.h
similarity index 100%
rename from clutter/clutter-stage-manager.h
rename to clutter/clutter/clutter-stage-manager.h
diff --git a/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h
similarity index 100%
rename from clutter/clutter-stage-private.h
rename to clutter/clutter/clutter-stage-private.h
diff --git a/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c
similarity index 100%
rename from clutter/clutter-stage-window.c
rename to clutter/clutter/clutter-stage-window.c
diff --git a/clutter/clutter-stage-window.h b/clutter/clutter/clutter-stage-window.h
similarity index 100%
rename from clutter/clutter-stage-window.h
rename to clutter/clutter/clutter-stage-window.h
diff --git a/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
similarity index 100%
rename from clutter/clutter-stage.c
rename to clutter/clutter/clutter-stage.c
diff --git a/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h
similarity index 100%
rename from clutter/clutter-stage.h
rename to clutter/clutter/clutter-stage.h
diff --git a/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c
similarity index 100%
rename from clutter/clutter-swipe-action.c
rename to clutter/clutter/clutter-swipe-action.c
diff --git a/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h
similarity index 100%
rename from clutter/clutter-swipe-action.h
rename to clutter/clutter/clutter-swipe-action.h
diff --git a/clutter/clutter-tap-action.c b/clutter/clutter/clutter-tap-action.c
similarity index 100%
rename from clutter/clutter-tap-action.c
rename to clutter/clutter/clutter-tap-action.c
diff --git a/clutter/clutter-tap-action.h b/clutter/clutter/clutter-tap-action.h
similarity index 100%
rename from clutter/clutter-tap-action.h
rename to clutter/clutter/clutter-tap-action.h
diff --git a/clutter/clutter-test-utils.c b/clutter/clutter/clutter-test-utils.c
similarity index 100%
rename from clutter/clutter-test-utils.c
rename to clutter/clutter/clutter-test-utils.c
diff --git a/clutter/clutter-test-utils.h b/clutter/clutter/clutter-test-utils.h
similarity index 100%
rename from clutter/clutter-test-utils.h
rename to clutter/clutter/clutter-test-utils.h
diff --git a/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c
similarity index 100%
rename from clutter/clutter-text-buffer.c
rename to clutter/clutter/clutter-text-buffer.c
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h
similarity index 100%
rename from clutter/clutter-text-buffer.h
rename to clutter/clutter/clutter-text-buffer.h
diff --git a/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
similarity index 100%
rename from clutter/clutter-text.c
rename to clutter/clutter/clutter-text.c
diff --git a/clutter/clutter-text.h b/clutter/clutter/clutter-text.h
similarity index 100%
rename from clutter/clutter-text.h
rename to clutter/clutter/clutter-text.h
diff --git a/clutter/clutter-texture.h b/clutter/clutter/clutter-texture.h
similarity index 100%
rename from clutter/clutter-texture.h
rename to clutter/clutter/clutter-texture.h
diff --git a/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
similarity index 100%
rename from clutter/clutter-timeline.c
rename to clutter/clutter/clutter-timeline.c
diff --git a/clutter/clutter-timeline.h b/clutter/clutter/clutter-timeline.h
similarity index 100%
rename from clutter/clutter-timeline.h
rename to clutter/clutter/clutter-timeline.h
diff --git a/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c
similarity index 100%
rename from clutter/clutter-transition-group.c
rename to clutter/clutter/clutter-transition-group.c
diff --git a/clutter/clutter-transition-group.h b/clutter/clutter/clutter-transition-group.h
similarity index 100%
rename from clutter/clutter-transition-group.h
rename to clutter/clutter/clutter-transition-group.h
diff --git a/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c
similarity index 100%
rename from clutter/clutter-transition.c
rename to clutter/clutter/clutter-transition.c
diff --git a/clutter/clutter-transition.h b/clutter/clutter/clutter-transition.h
similarity index 100%
rename from clutter/clutter-transition.h
rename to clutter/clutter/clutter-transition.h
diff --git a/clutter/clutter-types.h b/clutter/clutter/clutter-types.h
similarity index 100%
rename from clutter/clutter-types.h
rename to clutter/clutter/clutter-types.h
diff --git a/clutter/clutter-units.c b/clutter/clutter/clutter-units.c
similarity index 100%
rename from clutter/clutter-units.c
rename to clutter/clutter/clutter-units.c
diff --git a/clutter/clutter-units.h b/clutter/clutter/clutter-units.h
similarity index 100%
rename from clutter/clutter-units.h
rename to clutter/clutter/clutter-units.h
diff --git a/clutter/clutter-util.c b/clutter/clutter/clutter-util.c
similarity index 100%
rename from clutter/clutter-util.c
rename to clutter/clutter/clutter-util.c
diff --git a/clutter/clutter-version.h.in b/clutter/clutter/clutter-version.h.in
similarity index 100%
rename from clutter/clutter-version.h.in
rename to clutter/clutter/clutter-version.h.in
diff --git a/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c
similarity index 100%
rename from clutter/clutter-zoom-action.c
rename to clutter/clutter/clutter-zoom-action.c
diff --git a/clutter/clutter-zoom-action.h b/clutter/clutter/clutter-zoom-action.h
similarity index 100%
rename from clutter/clutter-zoom-action.h
rename to clutter/clutter/clutter-zoom-action.h
diff --git a/clutter/clutter.h b/clutter/clutter/clutter.h
similarity index 100%
rename from clutter/clutter.h
rename to clutter/clutter/clutter.h
diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
similarity index 100%
rename from clutter/cogl/clutter-stage-cogl.c
rename to clutter/clutter/cogl/clutter-stage-cogl.c
diff --git a/clutter/cogl/clutter-stage-cogl.h b/clutter/clutter/cogl/clutter-stage-cogl.h
similarity index 100%
rename from clutter/cogl/clutter-stage-cogl.h
rename to clutter/clutter/cogl/clutter-stage-cogl.h
diff --git a/clutter/deprecated/clutter-actor-deprecated.c b/clutter/clutter/deprecated/clutter-actor-deprecated.c
similarity index 100%
rename from clutter/deprecated/clutter-actor-deprecated.c
rename to clutter/clutter/deprecated/clutter-actor-deprecated.c
diff --git a/clutter/deprecated/clutter-actor.h b/clutter/clutter/deprecated/clutter-actor.h
similarity index 100%
rename from clutter/deprecated/clutter-actor.h
rename to clutter/clutter/deprecated/clutter-actor.h
diff --git a/clutter/deprecated/clutter-alpha.c b/clutter/clutter/deprecated/clutter-alpha.c
similarity index 100%
rename from clutter/deprecated/clutter-alpha.c
rename to clutter/clutter/deprecated/clutter-alpha.c
diff --git a/clutter/deprecated/clutter-alpha.h b/clutter/clutter/deprecated/clutter-alpha.h
similarity index 100%
rename from clutter/deprecated/clutter-alpha.h
rename to clutter/clutter/deprecated/clutter-alpha.h
diff --git a/clutter/deprecated/clutter-animatable.h b/clutter/clutter/deprecated/clutter-animatable.h
similarity index 100%
rename from clutter/deprecated/clutter-animatable.h
rename to clutter/clutter/deprecated/clutter-animatable.h
diff --git a/clutter/deprecated/clutter-animation.c b/clutter/clutter/deprecated/clutter-animation.c
similarity index 100%
rename from clutter/deprecated/clutter-animation.c
rename to clutter/clutter/deprecated/clutter-animation.c
diff --git a/clutter/deprecated/clutter-animation.h b/clutter/clutter/deprecated/clutter-animation.h
similarity index 100%
rename from clutter/deprecated/clutter-animation.h
rename to clutter/clutter/deprecated/clutter-animation.h
diff --git a/clutter/deprecated/clutter-animator.c b/clutter/clutter/deprecated/clutter-animator.c
similarity index 100%
rename from clutter/deprecated/clutter-animator.c
rename to clutter/clutter/deprecated/clutter-animator.c
diff --git a/clutter/deprecated/clutter-animator.h b/clutter/clutter/deprecated/clutter-animator.h
similarity index 100%
rename from clutter/deprecated/clutter-animator.h
rename to clutter/clutter/deprecated/clutter-animator.h
diff --git a/clutter/deprecated/clutter-backend.h b/clutter/clutter/deprecated/clutter-backend.h
similarity index 100%
rename from clutter/deprecated/clutter-backend.h
rename to clutter/clutter/deprecated/clutter-backend.h
diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/clutter/deprecated/clutter-behaviour-depth.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-depth.c
rename to clutter/clutter/deprecated/clutter-behaviour-depth.c
diff --git a/clutter/deprecated/clutter-behaviour-depth.h b/clutter/clutter/deprecated/clutter-behaviour-depth.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-depth.h
rename to clutter/clutter/deprecated/clutter-behaviour-depth.h
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-ellipse.c
rename to clutter/clutter/deprecated/clutter-behaviour-ellipse.c
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.h b/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-ellipse.h
rename to clutter/clutter/deprecated/clutter-behaviour-ellipse.h
diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-opacity.c
rename to clutter/clutter/deprecated/clutter-behaviour-opacity.c
diff --git a/clutter/deprecated/clutter-behaviour-opacity.h b/clutter/clutter/deprecated/clutter-behaviour-opacity.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-opacity.h
rename to clutter/clutter/deprecated/clutter-behaviour-opacity.h
diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/clutter/deprecated/clutter-behaviour-path.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-path.c
rename to clutter/clutter/deprecated/clutter-behaviour-path.c
diff --git a/clutter/deprecated/clutter-behaviour-path.h b/clutter/clutter/deprecated/clutter-behaviour-path.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-path.h
rename to clutter/clutter/deprecated/clutter-behaviour-path.h
diff --git a/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-rotate.c
rename to clutter/clutter/deprecated/clutter-behaviour-rotate.c
diff --git a/clutter/deprecated/clutter-behaviour-rotate.h b/clutter/clutter/deprecated/clutter-behaviour-rotate.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-rotate.h
rename to clutter/clutter/deprecated/clutter-behaviour-rotate.h
diff --git a/clutter/deprecated/clutter-behaviour-scale.c b/clutter/clutter/deprecated/clutter-behaviour-scale.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-scale.c
rename to clutter/clutter/deprecated/clutter-behaviour-scale.c
diff --git a/clutter/deprecated/clutter-behaviour-scale.h b/clutter/clutter/deprecated/clutter-behaviour-scale.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour-scale.h
rename to clutter/clutter/deprecated/clutter-behaviour-scale.h
diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/clutter/deprecated/clutter-behaviour.c
similarity index 100%
rename from clutter/deprecated/clutter-behaviour.c
rename to clutter/clutter/deprecated/clutter-behaviour.c
diff --git a/clutter/deprecated/clutter-behaviour.h b/clutter/clutter/deprecated/clutter-behaviour.h
similarity index 100%
rename from clutter/deprecated/clutter-behaviour.h
rename to clutter/clutter/deprecated/clutter-behaviour.h
diff --git a/clutter/deprecated/clutter-bin-layout.h b/clutter/clutter/deprecated/clutter-bin-layout.h
similarity index 100%
rename from clutter/deprecated/clutter-bin-layout.h
rename to clutter/clutter/deprecated/clutter-bin-layout.h
diff --git a/clutter/deprecated/clutter-box.c b/clutter/clutter/deprecated/clutter-box.c
similarity index 100%
rename from clutter/deprecated/clutter-box.c
rename to clutter/clutter/deprecated/clutter-box.c
diff --git a/clutter/deprecated/clutter-box.h b/clutter/clutter/deprecated/clutter-box.h
similarity index 100%
rename from clutter/deprecated/clutter-box.h
rename to clutter/clutter/deprecated/clutter-box.h
diff --git a/clutter/deprecated/clutter-cairo-texture.c b/clutter/clutter/deprecated/clutter-cairo-texture.c
similarity index 100%
rename from clutter/deprecated/clutter-cairo-texture.c
rename to clutter/clutter/deprecated/clutter-cairo-texture.c
diff --git a/clutter/deprecated/clutter-cairo-texture.h b/clutter/clutter/deprecated/clutter-cairo-texture.h
similarity index 100%
rename from clutter/deprecated/clutter-cairo-texture.h
rename to clutter/clutter/deprecated/clutter-cairo-texture.h
diff --git a/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h
similarity index 100%
rename from clutter/deprecated/clutter-container.h
rename to clutter/clutter/deprecated/clutter-container.h
diff --git a/clutter/deprecated/clutter-fixed.c b/clutter/clutter/deprecated/clutter-fixed.c
similarity index 100%
rename from clutter/deprecated/clutter-fixed.c
rename to clutter/clutter/deprecated/clutter-fixed.c
diff --git a/clutter/deprecated/clutter-fixed.h b/clutter/clutter/deprecated/clutter-fixed.h
similarity index 100%
rename from clutter/deprecated/clutter-fixed.h
rename to clutter/clutter/deprecated/clutter-fixed.h
diff --git a/clutter/deprecated/clutter-frame-source.c b/clutter/clutter/deprecated/clutter-frame-source.c
similarity index 100%
rename from clutter/deprecated/clutter-frame-source.c
rename to clutter/clutter/deprecated/clutter-frame-source.c
diff --git a/clutter/deprecated/clutter-frame-source.h b/clutter/clutter/deprecated/clutter-frame-source.h
similarity index 100%
rename from clutter/deprecated/clutter-frame-source.h
rename to clutter/clutter/deprecated/clutter-frame-source.h
diff --git a/clutter/deprecated/clutter-group.c b/clutter/clutter/deprecated/clutter-group.c
similarity index 100%
rename from clutter/deprecated/clutter-group.c
rename to clutter/clutter/deprecated/clutter-group.c
diff --git a/clutter/deprecated/clutter-group.h b/clutter/clutter/deprecated/clutter-group.h
similarity index 100%
rename from clutter/deprecated/clutter-group.h
rename to clutter/clutter/deprecated/clutter-group.h
diff --git a/clutter/deprecated/clutter-input-device-deprecated.c b/clutter/clutter/deprecated/clutter-input-device-deprecated.c
similarity index 100%
rename from clutter/deprecated/clutter-input-device-deprecated.c
rename to clutter/clutter/deprecated/clutter-input-device-deprecated.c
diff --git a/clutter/deprecated/clutter-input-device.h b/clutter/clutter/deprecated/clutter-input-device.h
similarity index 100%
rename from clutter/deprecated/clutter-input-device.h
rename to clutter/clutter/deprecated/clutter-input-device.h
diff --git a/clutter/deprecated/clutter-keysyms.h b/clutter/clutter/deprecated/clutter-keysyms.h
similarity index 100%
rename from clutter/deprecated/clutter-keysyms.h
rename to clutter/clutter/deprecated/clutter-keysyms.h
diff --git a/clutter/deprecated/clutter-layout-manager-deprecated.c b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
similarity index 100%
rename from clutter/deprecated/clutter-layout-manager-deprecated.c
rename to clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
diff --git a/clutter/deprecated/clutter-list-model.c b/clutter/clutter/deprecated/clutter-list-model.c
similarity index 100%
rename from clutter/deprecated/clutter-list-model.c
rename to clutter/clutter/deprecated/clutter-list-model.c
diff --git a/clutter/deprecated/clutter-list-model.h b/clutter/clutter/deprecated/clutter-list-model.h
similarity index 100%
rename from clutter/deprecated/clutter-list-model.h
rename to clutter/clutter/deprecated/clutter-list-model.h
diff --git a/clutter/deprecated/clutter-main.h b/clutter/clutter/deprecated/clutter-main.h
similarity index 100%
rename from clutter/deprecated/clutter-main.h
rename to clutter/clutter/deprecated/clutter-main.h
diff --git a/clutter/deprecated/clutter-media.c b/clutter/clutter/deprecated/clutter-media.c
similarity index 100%
rename from clutter/deprecated/clutter-media.c
rename to clutter/clutter/deprecated/clutter-media.c
diff --git a/clutter/deprecated/clutter-media.h b/clutter/clutter/deprecated/clutter-media.h
similarity index 100%
rename from clutter/deprecated/clutter-media.h
rename to clutter/clutter/deprecated/clutter-media.h
diff --git a/clutter/deprecated/clutter-model-private.h b/clutter/clutter/deprecated/clutter-model-private.h
similarity index 100%
rename from clutter/deprecated/clutter-model-private.h
rename to clutter/clutter/deprecated/clutter-model-private.h
diff --git a/clutter/deprecated/clutter-model.c b/clutter/clutter/deprecated/clutter-model.c
similarity index 100%
rename from clutter/deprecated/clutter-model.c
rename to clutter/clutter/deprecated/clutter-model.c
diff --git a/clutter/deprecated/clutter-model.h b/clutter/clutter/deprecated/clutter-model.h
similarity index 100%
rename from clutter/deprecated/clutter-model.h
rename to clutter/clutter/deprecated/clutter-model.h
diff --git a/clutter/deprecated/clutter-rectangle.c b/clutter/clutter/deprecated/clutter-rectangle.c
similarity index 100%
rename from clutter/deprecated/clutter-rectangle.c
rename to clutter/clutter/deprecated/clutter-rectangle.c
diff --git a/clutter/deprecated/clutter-rectangle.h b/clutter/clutter/deprecated/clutter-rectangle.h
similarity index 100%
rename from clutter/deprecated/clutter-rectangle.h
rename to clutter/clutter/deprecated/clutter-rectangle.h
diff --git a/clutter/deprecated/clutter-score.c b/clutter/clutter/deprecated/clutter-score.c
similarity index 100%
rename from clutter/deprecated/clutter-score.c
rename to clutter/clutter/deprecated/clutter-score.c
diff --git a/clutter/deprecated/clutter-score.h b/clutter/clutter/deprecated/clutter-score.h
similarity index 100%
rename from clutter/deprecated/clutter-score.h
rename to clutter/clutter/deprecated/clutter-score.h
diff --git a/clutter/deprecated/clutter-shader.c b/clutter/clutter/deprecated/clutter-shader.c
similarity index 100%
rename from clutter/deprecated/clutter-shader.c
rename to clutter/clutter/deprecated/clutter-shader.c
diff --git a/clutter/deprecated/clutter-shader.h b/clutter/clutter/deprecated/clutter-shader.h
similarity index 100%
rename from clutter/deprecated/clutter-shader.h
rename to clutter/clutter/deprecated/clutter-shader.h
diff --git a/clutter/deprecated/clutter-stage-manager.h b/clutter/clutter/deprecated/clutter-stage-manager.h
similarity index 100%
rename from clutter/deprecated/clutter-stage-manager.h
rename to clutter/clutter/deprecated/clutter-stage-manager.h
diff --git a/clutter/deprecated/clutter-stage.h b/clutter/clutter/deprecated/clutter-stage.h
similarity index 100%
rename from clutter/deprecated/clutter-stage.h
rename to clutter/clutter/deprecated/clutter-stage.h
diff --git a/clutter/deprecated/clutter-state.c b/clutter/clutter/deprecated/clutter-state.c
similarity index 100%
rename from clutter/deprecated/clutter-state.c
rename to clutter/clutter/deprecated/clutter-state.c
diff --git a/clutter/deprecated/clutter-state.h b/clutter/clutter/deprecated/clutter-state.h
similarity index 100%
rename from clutter/deprecated/clutter-state.h
rename to clutter/clutter/deprecated/clutter-state.h
diff --git a/clutter/deprecated/clutter-table-layout.c b/clutter/clutter/deprecated/clutter-table-layout.c
similarity index 100%
rename from clutter/deprecated/clutter-table-layout.c
rename to clutter/clutter/deprecated/clutter-table-layout.c
diff --git a/clutter/deprecated/clutter-table-layout.h b/clutter/clutter/deprecated/clutter-table-layout.h
similarity index 100%
rename from clutter/deprecated/clutter-table-layout.h
rename to clutter/clutter/deprecated/clutter-table-layout.h
diff --git a/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
similarity index 100%
rename from clutter/deprecated/clutter-texture.c
rename to clutter/clutter/deprecated/clutter-texture.c
diff --git a/clutter/deprecated/clutter-texture.h b/clutter/clutter/deprecated/clutter-texture.h
similarity index 100%
rename from clutter/deprecated/clutter-texture.h
rename to clutter/clutter/deprecated/clutter-texture.h
diff --git a/clutter/deprecated/clutter-timeline.h b/clutter/clutter/deprecated/clutter-timeline.h
similarity index 100%
rename from clutter/deprecated/clutter-timeline.h
rename to clutter/clutter/deprecated/clutter-timeline.h
diff --git a/clutter/deprecated/clutter-timeout-interval.c b/clutter/clutter/deprecated/clutter-timeout-interval.c
similarity index 100%
rename from clutter/deprecated/clutter-timeout-interval.c
rename to clutter/clutter/deprecated/clutter-timeout-interval.c
diff --git a/clutter/deprecated/clutter-timeout-interval.h b/clutter/clutter/deprecated/clutter-timeout-interval.h
similarity index 100%
rename from clutter/deprecated/clutter-timeout-interval.h
rename to clutter/clutter/deprecated/clutter-timeout-interval.h
diff --git a/clutter/deprecated/clutter-timeout-pool.c b/clutter/clutter/deprecated/clutter-timeout-pool.c
similarity index 100%
rename from clutter/deprecated/clutter-timeout-pool.c
rename to clutter/clutter/deprecated/clutter-timeout-pool.c
diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/clutter/deprecated/clutter-timeout-pool.h
similarity index 100%
rename from clutter/deprecated/clutter-timeout-pool.h
rename to clutter/clutter/deprecated/clutter-timeout-pool.h
diff --git a/clutter/deprecated/clutter-util.h b/clutter/clutter/deprecated/clutter-util.h
similarity index 100%
rename from clutter/deprecated/clutter-util.h
rename to clutter/clutter/deprecated/clutter-util.h
diff --git a/clutter/egl/clutter-backend-eglnative.c b/clutter/clutter/egl/clutter-backend-eglnative.c
similarity index 100%
rename from clutter/egl/clutter-backend-eglnative.c
rename to clutter/clutter/egl/clutter-backend-eglnative.c
diff --git a/clutter/egl/clutter-backend-eglnative.h b/clutter/clutter/egl/clutter-backend-eglnative.h
similarity index 100%
rename from clutter/egl/clutter-backend-eglnative.h
rename to clutter/clutter/egl/clutter-backend-eglnative.h
diff --git a/clutter/egl/clutter-egl-headers.h b/clutter/clutter/egl/clutter-egl-headers.h
similarity index 100%
rename from clutter/egl/clutter-egl-headers.h
rename to clutter/clutter/egl/clutter-egl-headers.h
diff --git a/clutter/egl/clutter-egl.h b/clutter/clutter/egl/clutter-egl.h
similarity index 100%
rename from clutter/egl/clutter-egl.h
rename to clutter/clutter/egl/clutter-egl.h
diff --git a/clutter/egl/clutter-stage-eglnative.c b/clutter/clutter/egl/clutter-stage-eglnative.c
similarity index 100%
rename from clutter/egl/clutter-stage-eglnative.c
rename to clutter/clutter/egl/clutter-stage-eglnative.c
diff --git a/clutter/egl/clutter-stage-eglnative.h b/clutter/clutter/egl/clutter-stage-eglnative.h
similarity index 100%
rename from clutter/egl/clutter-stage-eglnative.h
rename to clutter/clutter/egl/clutter-stage-eglnative.h
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/clutter/evdev/clutter-device-manager-evdev.c
similarity index 100%
rename from clutter/evdev/clutter-device-manager-evdev.c
rename to clutter/clutter/evdev/clutter-device-manager-evdev.c
diff --git a/clutter/evdev/clutter-device-manager-evdev.h b/clutter/clutter/evdev/clutter-device-manager-evdev.h
similarity index 100%
rename from clutter/evdev/clutter-device-manager-evdev.h
rename to clutter/clutter/evdev/clutter-device-manager-evdev.h
diff --git a/clutter/evdev/clutter-evdev.h b/clutter/clutter/evdev/clutter-evdev.h
similarity index 100%
rename from clutter/evdev/clutter-evdev.h
rename to clutter/clutter/evdev/clutter-evdev.h
diff --git a/clutter/evdev/clutter-event-evdev.c b/clutter/clutter/evdev/clutter-event-evdev.c
similarity index 100%
rename from clutter/evdev/clutter-event-evdev.c
rename to clutter/clutter/evdev/clutter-event-evdev.c
diff --git a/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
similarity index 100%
rename from clutter/evdev/clutter-input-device-evdev.c
rename to clutter/clutter/evdev/clutter-input-device-evdev.c
diff --git a/clutter/evdev/clutter-input-device-evdev.h b/clutter/clutter/evdev/clutter-input-device-evdev.h
similarity index 100%
rename from clutter/evdev/clutter-input-device-evdev.h
rename to clutter/clutter/evdev/clutter-input-device-evdev.h
diff --git a/clutter/evdev/clutter-xkb-utils.c b/clutter/clutter/evdev/clutter-xkb-utils.c
similarity index 100%
rename from clutter/evdev/clutter-xkb-utils.c
rename to clutter/clutter/evdev/clutter-xkb-utils.c
diff --git a/clutter/evdev/clutter-xkb-utils.h b/clutter/clutter/evdev/clutter-xkb-utils.h
similarity index 100%
rename from clutter/evdev/clutter-xkb-utils.h
rename to clutter/clutter/evdev/clutter-xkb-utils.h
diff --git a/clutter/mutter-clutter.pc.in b/clutter/clutter/mutter-clutter.pc.in
similarity index 100%
rename from clutter/mutter-clutter.pc.in
rename to clutter/clutter/mutter-clutter.pc.in
diff --git a/clutter/wayland/clutter-wayland-compositor.h b/clutter/clutter/wayland/clutter-wayland-compositor.h
similarity index 100%
rename from clutter/wayland/clutter-wayland-compositor.h
rename to clutter/clutter/wayland/clutter-wayland-compositor.h
diff --git a/clutter/wayland/clutter-wayland-surface.c b/clutter/clutter/wayland/clutter-wayland-surface.c
similarity index 100%
rename from clutter/wayland/clutter-wayland-surface.c
rename to clutter/clutter/wayland/clutter-wayland-surface.c
diff --git a/clutter/wayland/clutter-wayland-surface.h b/clutter/clutter/wayland/clutter-wayland-surface.h
similarity index 100%
rename from clutter/wayland/clutter-wayland-surface.h
rename to clutter/clutter/wayland/clutter-wayland-surface.h
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
similarity index 100%
rename from clutter/x11/clutter-backend-x11.c
rename to clutter/clutter/x11/clutter-backend-x11.c
diff --git a/clutter/x11/clutter-backend-x11.h b/clutter/clutter/x11/clutter-backend-x11.h
similarity index 100%
rename from clutter/x11/clutter-backend-x11.h
rename to clutter/clutter/x11/clutter-backend-x11.h
diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/clutter/x11/clutter-device-manager-core-x11.c
similarity index 100%
rename from clutter/x11/clutter-device-manager-core-x11.c
rename to clutter/clutter/x11/clutter-device-manager-core-x11.c
diff --git a/clutter/x11/clutter-device-manager-core-x11.h b/clutter/clutter/x11/clutter-device-manager-core-x11.h
similarity index 100%
rename from clutter/x11/clutter-device-manager-core-x11.h
rename to clutter/clutter/x11/clutter-device-manager-core-x11.h
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c
similarity index 100%
rename from clutter/x11/clutter-device-manager-xi2.c
rename to clutter/clutter/x11/clutter-device-manager-xi2.c
diff --git a/clutter/x11/clutter-device-manager-xi2.h b/clutter/clutter/x11/clutter-device-manager-xi2.h
similarity index 100%
rename from clutter/x11/clutter-device-manager-xi2.h
rename to clutter/clutter/x11/clutter-device-manager-xi2.h
diff --git a/clutter/x11/clutter-event-x11.c b/clutter/clutter/x11/clutter-event-x11.c
similarity index 100%
rename from clutter/x11/clutter-event-x11.c
rename to clutter/clutter/x11/clutter-event-x11.c
diff --git a/clutter/x11/clutter-glx-texture-pixmap.c b/clutter/clutter/x11/clutter-glx-texture-pixmap.c
similarity index 100%
rename from clutter/x11/clutter-glx-texture-pixmap.c
rename to clutter/clutter/x11/clutter-glx-texture-pixmap.c
diff --git a/clutter/x11/clutter-glx-texture-pixmap.h b/clutter/clutter/x11/clutter-glx-texture-pixmap.h
similarity index 100%
rename from clutter/x11/clutter-glx-texture-pixmap.h
rename to clutter/clutter/x11/clutter-glx-texture-pixmap.h
diff --git a/clutter/x11/clutter-glx.h b/clutter/clutter/x11/clutter-glx.h
similarity index 100%
rename from clutter/x11/clutter-glx.h
rename to clutter/clutter/x11/clutter-glx.h
diff --git a/clutter/x11/clutter-input-device-core-x11.c b/clutter/clutter/x11/clutter-input-device-core-x11.c
similarity index 100%
rename from clutter/x11/clutter-input-device-core-x11.c
rename to clutter/clutter/x11/clutter-input-device-core-x11.c
diff --git a/clutter/x11/clutter-input-device-core-x11.h b/clutter/clutter/x11/clutter-input-device-core-x11.h
similarity index 100%
rename from clutter/x11/clutter-input-device-core-x11.h
rename to clutter/clutter/x11/clutter-input-device-core-x11.h
diff --git a/clutter/x11/clutter-input-device-xi2.c b/clutter/clutter/x11/clutter-input-device-xi2.c
similarity index 100%
rename from clutter/x11/clutter-input-device-xi2.c
rename to clutter/clutter/x11/clutter-input-device-xi2.c
diff --git a/clutter/x11/clutter-input-device-xi2.h b/clutter/clutter/x11/clutter-input-device-xi2.h
similarity index 100%
rename from clutter/x11/clutter-input-device-xi2.h
rename to clutter/clutter/x11/clutter-input-device-xi2.h
diff --git a/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c
similarity index 100%
rename from clutter/x11/clutter-keymap-x11.c
rename to clutter/clutter/x11/clutter-keymap-x11.c
diff --git a/clutter/x11/clutter-keymap-x11.h b/clutter/clutter/x11/clutter-keymap-x11.h
similarity index 100%
rename from clutter/x11/clutter-keymap-x11.h
rename to clutter/clutter/x11/clutter-keymap-x11.h
diff --git a/clutter/x11/clutter-settings-x11.h b/clutter/clutter/x11/clutter-settings-x11.h
similarity index 100%
rename from clutter/x11/clutter-settings-x11.h
rename to clutter/clutter/x11/clutter-settings-x11.h
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/clutter/x11/clutter-stage-x11.c
similarity index 100%
rename from clutter/x11/clutter-stage-x11.c
rename to clutter/clutter/x11/clutter-stage-x11.c
diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/clutter/x11/clutter-stage-x11.h
similarity index 100%
rename from clutter/x11/clutter-stage-x11.h
rename to clutter/clutter/x11/clutter-stage-x11.h
diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/clutter/x11/clutter-x11-texture-pixmap.c
similarity index 100%
rename from clutter/x11/clutter-x11-texture-pixmap.c
rename to clutter/clutter/x11/clutter-x11-texture-pixmap.c
diff --git a/clutter/x11/clutter-x11-texture-pixmap.h b/clutter/clutter/x11/clutter-x11-texture-pixmap.h
similarity index 100%
rename from clutter/x11/clutter-x11-texture-pixmap.h
rename to clutter/clutter/x11/clutter-x11-texture-pixmap.h
diff --git a/clutter/x11/clutter-x11.h b/clutter/clutter/x11/clutter-x11.h
similarity index 100%
rename from clutter/x11/clutter-x11.h
rename to clutter/clutter/x11/clutter-x11.h
diff --git a/clutter/x11/xsettings/xsettings-client.c b/clutter/clutter/x11/xsettings/xsettings-client.c
similarity index 100%
rename from clutter/x11/xsettings/xsettings-client.c
rename to clutter/clutter/x11/xsettings/xsettings-client.c
diff --git a/clutter/x11/xsettings/xsettings-client.h b/clutter/clutter/x11/xsettings/xsettings-client.h
similarity index 100%
rename from clutter/x11/xsettings/xsettings-client.h
rename to clutter/clutter/x11/xsettings/xsettings-client.h
diff --git a/clutter/x11/xsettings/xsettings-common.c b/clutter/clutter/x11/xsettings/xsettings-common.c
similarity index 100%
rename from clutter/x11/xsettings/xsettings-common.c
rename to clutter/clutter/x11/xsettings/xsettings-common.c
diff --git a/clutter/x11/xsettings/xsettings-common.h b/clutter/clutter/x11/xsettings/xsettings-common.h
similarity index 100%
rename from clutter/x11/xsettings/xsettings-common.h
rename to clutter/clutter/x11/xsettings/xsettings-common.h
diff --git a/configure.ac b/clutter/configure.ac
similarity index 100%
rename from configure.ac
rename to clutter/configure.ac
diff --git a/examples/Makefile.am b/clutter/examples/Makefile.am
similarity index 100%
rename from examples/Makefile.am
rename to clutter/examples/Makefile.am
diff --git a/examples/README b/clutter/examples/README
similarity index 100%
rename from examples/README
rename to clutter/examples/README
diff --git a/examples/actor-model.c b/clutter/examples/actor-model.c
similarity index 100%
rename from examples/actor-model.c
rename to clutter/examples/actor-model.c
diff --git a/examples/basic-actor.c b/clutter/examples/basic-actor.c
similarity index 100%
rename from examples/basic-actor.c
rename to clutter/examples/basic-actor.c
diff --git a/examples/bin-layout.c b/clutter/examples/bin-layout.c
similarity index 100%
rename from examples/bin-layout.c
rename to clutter/examples/bin-layout.c
diff --git a/examples/box-layout.c b/clutter/examples/box-layout.c
similarity index 100%
rename from examples/box-layout.c
rename to clutter/examples/box-layout.c
diff --git a/examples/canvas.c b/clutter/examples/canvas.c
similarity index 100%
rename from examples/canvas.c
rename to clutter/examples/canvas.c
diff --git a/examples/constraints.c b/clutter/examples/constraints.c
similarity index 100%
rename from examples/constraints.c
rename to clutter/examples/constraints.c
diff --git a/examples/drag-action.c b/clutter/examples/drag-action.c
similarity index 100%
rename from examples/drag-action.c
rename to clutter/examples/drag-action.c
diff --git a/examples/drop-action.c b/clutter/examples/drop-action.c
similarity index 100%
rename from examples/drop-action.c
rename to clutter/examples/drop-action.c
diff --git a/examples/easing-modes.c b/clutter/examples/easing-modes.c
similarity index 100%
rename from examples/easing-modes.c
rename to clutter/examples/easing-modes.c
diff --git a/examples/flow-layout.c b/clutter/examples/flow-layout.c
similarity index 100%
rename from examples/flow-layout.c
rename to clutter/examples/flow-layout.c
diff --git a/examples/grid-layout.c b/clutter/examples/grid-layout.c
similarity index 100%
rename from examples/grid-layout.c
rename to clutter/examples/grid-layout.c
diff --git a/examples/image-content.c b/clutter/examples/image-content.c
similarity index 100%
rename from examples/image-content.c
rename to clutter/examples/image-content.c
diff --git a/examples/layout-manager.c b/clutter/examples/layout-manager.c
similarity index 100%
rename from examples/layout-manager.c
rename to clutter/examples/layout-manager.c
diff --git a/examples/pan-action.c b/clutter/examples/pan-action.c
similarity index 100%
rename from examples/pan-action.c
rename to clutter/examples/pan-action.c
diff --git a/examples/redhand.png b/clutter/examples/redhand.png
similarity index 100%
rename from examples/redhand.png
rename to clutter/examples/redhand.png
diff --git a/examples/rounded-rectangle.c b/clutter/examples/rounded-rectangle.c
similarity index 100%
rename from examples/rounded-rectangle.c
rename to clutter/examples/rounded-rectangle.c
diff --git a/examples/scroll-actor.c b/clutter/examples/scroll-actor.c
similarity index 100%
rename from examples/scroll-actor.c
rename to clutter/examples/scroll-actor.c
diff --git a/examples/threads.c b/clutter/examples/threads.c
similarity index 100%
rename from examples/threads.c
rename to clutter/examples/threads.c
diff --git a/tests/Makefile.am b/clutter/tests/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to clutter/tests/Makefile.am
diff --git a/tests/README b/clutter/tests/README
similarity index 100%
rename from tests/README
rename to clutter/tests/README
diff --git a/tests/accessibility/Makefile.am b/clutter/tests/accessibility/Makefile.am
similarity index 100%
rename from tests/accessibility/Makefile.am
rename to clutter/tests/accessibility/Makefile.am
diff --git a/tests/accessibility/cally-atkcomponent-example.c b/clutter/tests/accessibility/cally-atkcomponent-example.c
similarity index 100%
rename from tests/accessibility/cally-atkcomponent-example.c
rename to clutter/tests/accessibility/cally-atkcomponent-example.c
diff --git a/tests/accessibility/cally-atkeditabletext-example.c b/clutter/tests/accessibility/cally-atkeditabletext-example.c
similarity index 100%
rename from tests/accessibility/cally-atkeditabletext-example.c
rename to clutter/tests/accessibility/cally-atkeditabletext-example.c
diff --git a/tests/accessibility/cally-atkevents-example.c b/clutter/tests/accessibility/cally-atkevents-example.c
similarity index 100%
rename from tests/accessibility/cally-atkevents-example.c
rename to clutter/tests/accessibility/cally-atkevents-example.c
diff --git a/tests/accessibility/cally-atktext-example.c b/clutter/tests/accessibility/cally-atktext-example.c
similarity index 100%
rename from tests/accessibility/cally-atktext-example.c
rename to clutter/tests/accessibility/cally-atktext-example.c
diff --git a/tests/accessibility/cally-clone-example.c b/clutter/tests/accessibility/cally-clone-example.c
similarity index 100%
rename from tests/accessibility/cally-clone-example.c
rename to clutter/tests/accessibility/cally-clone-example.c
diff --git a/tests/accessibility/cally-examples-util.c b/clutter/tests/accessibility/cally-examples-util.c
similarity index 100%
rename from tests/accessibility/cally-examples-util.c
rename to clutter/tests/accessibility/cally-examples-util.c
diff --git a/tests/accessibility/cally-examples-util.h b/clutter/tests/accessibility/cally-examples-util.h
similarity index 100%
rename from tests/accessibility/cally-examples-util.h
rename to clutter/tests/accessibility/cally-examples-util.h
diff --git a/tests/clutter-1.0.suppressions b/clutter/tests/clutter-1.0.suppressions
similarity index 100%
rename from tests/clutter-1.0.suppressions
rename to clutter/tests/clutter-1.0.suppressions
diff --git a/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
similarity index 100%
rename from tests/conform/Makefile.am
rename to clutter/tests/conform/Makefile.am
diff --git a/tests/conform/actor-anchors.c b/clutter/tests/conform/actor-anchors.c
similarity index 100%
rename from tests/conform/actor-anchors.c
rename to clutter/tests/conform/actor-anchors.c
diff --git a/tests/conform/actor-destroy.c b/clutter/tests/conform/actor-destroy.c
similarity index 100%
rename from tests/conform/actor-destroy.c
rename to clutter/tests/conform/actor-destroy.c
diff --git a/tests/conform/actor-graph.c b/clutter/tests/conform/actor-graph.c
similarity index 100%
rename from tests/conform/actor-graph.c
rename to clutter/tests/conform/actor-graph.c
diff --git a/tests/conform/actor-invariants.c b/clutter/tests/conform/actor-invariants.c
similarity index 100%
rename from tests/conform/actor-invariants.c
rename to clutter/tests/conform/actor-invariants.c
diff --git a/tests/conform/actor-iter.c b/clutter/tests/conform/actor-iter.c
similarity index 100%
rename from tests/conform/actor-iter.c
rename to clutter/tests/conform/actor-iter.c
diff --git a/tests/conform/actor-layout.c b/clutter/tests/conform/actor-layout.c
similarity index 100%
rename from tests/conform/actor-layout.c
rename to clutter/tests/conform/actor-layout.c
diff --git a/tests/conform/actor-meta.c b/clutter/tests/conform/actor-meta.c
similarity index 100%
rename from tests/conform/actor-meta.c
rename to clutter/tests/conform/actor-meta.c
diff --git a/tests/conform/actor-offscreen-limit-max-size.c b/clutter/tests/conform/actor-offscreen-limit-max-size.c
similarity index 100%
rename from tests/conform/actor-offscreen-limit-max-size.c
rename to clutter/tests/conform/actor-offscreen-limit-max-size.c
diff --git a/tests/conform/actor-offscreen-redirect.c b/clutter/tests/conform/actor-offscreen-redirect.c
similarity index 100%
rename from tests/conform/actor-offscreen-redirect.c
rename to clutter/tests/conform/actor-offscreen-redirect.c
diff --git a/tests/conform/actor-paint-opacity.c b/clutter/tests/conform/actor-paint-opacity.c
similarity index 100%
rename from tests/conform/actor-paint-opacity.c
rename to clutter/tests/conform/actor-paint-opacity.c
diff --git a/tests/conform/actor-pick.c b/clutter/tests/conform/actor-pick.c
similarity index 100%
rename from tests/conform/actor-pick.c
rename to clutter/tests/conform/actor-pick.c
diff --git a/tests/conform/actor-shader-effect.c b/clutter/tests/conform/actor-shader-effect.c
similarity index 100%
rename from tests/conform/actor-shader-effect.c
rename to clutter/tests/conform/actor-shader-effect.c
diff --git a/tests/conform/actor-size.c b/clutter/tests/conform/actor-size.c
similarity index 100%
rename from tests/conform/actor-size.c
rename to clutter/tests/conform/actor-size.c
diff --git a/tests/conform/animator.c b/clutter/tests/conform/animator.c
similarity index 100%
rename from tests/conform/animator.c
rename to clutter/tests/conform/animator.c
diff --git a/tests/conform/behaviours.c b/clutter/tests/conform/behaviours.c
similarity index 100%
rename from tests/conform/behaviours.c
rename to clutter/tests/conform/behaviours.c
diff --git a/tests/conform/binding-pool.c b/clutter/tests/conform/binding-pool.c
similarity index 100%
rename from tests/conform/binding-pool.c
rename to clutter/tests/conform/binding-pool.c
diff --git a/tests/conform/cairo-texture.c b/clutter/tests/conform/cairo-texture.c
similarity index 100%
rename from tests/conform/cairo-texture.c
rename to clutter/tests/conform/cairo-texture.c
diff --git a/tests/conform/cally-text.c b/clutter/tests/conform/cally-text.c
similarity index 100%
rename from tests/conform/cally-text.c
rename to clutter/tests/conform/cally-text.c
diff --git a/tests/conform/color.c b/clutter/tests/conform/color.c
similarity index 100%
rename from tests/conform/color.c
rename to clutter/tests/conform/color.c
diff --git a/tests/conform/events-touch.c b/clutter/tests/conform/events-touch.c
similarity index 100%
rename from tests/conform/events-touch.c
rename to clutter/tests/conform/events-touch.c
diff --git a/tests/conform/group.c b/clutter/tests/conform/group.c
similarity index 100%
rename from tests/conform/group.c
rename to clutter/tests/conform/group.c
diff --git a/tests/conform/interval.c b/clutter/tests/conform/interval.c
similarity index 100%
rename from tests/conform/interval.c
rename to clutter/tests/conform/interval.c
diff --git a/tests/conform/model.c b/clutter/tests/conform/model.c
similarity index 100%
rename from tests/conform/model.c
rename to clutter/tests/conform/model.c
diff --git a/tests/conform/path.c b/clutter/tests/conform/path.c
similarity index 100%
rename from tests/conform/path.c
rename to clutter/tests/conform/path.c
diff --git a/tests/conform/rectangle.c b/clutter/tests/conform/rectangle.c
similarity index 100%
rename from tests/conform/rectangle.c
rename to clutter/tests/conform/rectangle.c
diff --git a/tests/conform/score.c b/clutter/tests/conform/score.c
similarity index 100%
rename from tests/conform/score.c
rename to clutter/tests/conform/score.c
diff --git a/tests/conform/script-parser.c b/clutter/tests/conform/script-parser.c
similarity index 100%
rename from tests/conform/script-parser.c
rename to clutter/tests/conform/script-parser.c
diff --git a/tests/conform/scripts/test-animator-1.json b/clutter/tests/conform/scripts/test-animator-1.json
similarity index 100%
rename from tests/conform/scripts/test-animator-1.json
rename to clutter/tests/conform/scripts/test-animator-1.json
diff --git a/tests/conform/scripts/test-animator-2.json b/clutter/tests/conform/scripts/test-animator-2.json
similarity index 100%
rename from tests/conform/scripts/test-animator-2.json
rename to clutter/tests/conform/scripts/test-animator-2.json
diff --git a/tests/conform/scripts/test-animator-3.json b/clutter/tests/conform/scripts/test-animator-3.json
similarity index 100%
rename from tests/conform/scripts/test-animator-3.json
rename to clutter/tests/conform/scripts/test-animator-3.json
diff --git a/tests/conform/scripts/test-script-animation.json b/clutter/tests/conform/scripts/test-script-animation.json
similarity index 100%
rename from tests/conform/scripts/test-script-animation.json
rename to clutter/tests/conform/scripts/test-script-animation.json
diff --git a/tests/conform/scripts/test-script-child.json b/clutter/tests/conform/scripts/test-script-child.json
similarity index 100%
rename from tests/conform/scripts/test-script-child.json
rename to clutter/tests/conform/scripts/test-script-child.json
diff --git a/tests/conform/scripts/test-script-implicit-alpha.json b/clutter/tests/conform/scripts/test-script-implicit-alpha.json
similarity index 100%
rename from tests/conform/scripts/test-script-implicit-alpha.json
rename to clutter/tests/conform/scripts/test-script-implicit-alpha.json
diff --git a/tests/conform/scripts/test-script-interval.json b/clutter/tests/conform/scripts/test-script-interval.json
similarity index 100%
rename from tests/conform/scripts/test-script-interval.json
rename to clutter/tests/conform/scripts/test-script-interval.json
diff --git a/tests/conform/scripts/test-script-layout-property.json b/clutter/tests/conform/scripts/test-script-layout-property.json
similarity index 100%
rename from tests/conform/scripts/test-script-layout-property.json
rename to clutter/tests/conform/scripts/test-script-layout-property.json
diff --git a/tests/conform/scripts/test-script-margin.json b/clutter/tests/conform/scripts/test-script-margin.json
similarity index 100%
rename from tests/conform/scripts/test-script-margin.json
rename to clutter/tests/conform/scripts/test-script-margin.json
diff --git a/tests/conform/scripts/test-script-model.json b/clutter/tests/conform/scripts/test-script-model.json
similarity index 100%
rename from tests/conform/scripts/test-script-model.json
rename to clutter/tests/conform/scripts/test-script-model.json
diff --git a/tests/conform/scripts/test-script-named-object.json b/clutter/tests/conform/scripts/test-script-named-object.json
similarity index 100%
rename from tests/conform/scripts/test-script-named-object.json
rename to clutter/tests/conform/scripts/test-script-named-object.json
diff --git a/tests/conform/scripts/test-script-object-property.json b/clutter/tests/conform/scripts/test-script-object-property.json
similarity index 100%
rename from tests/conform/scripts/test-script-object-property.json
rename to clutter/tests/conform/scripts/test-script-object-property.json
diff --git a/tests/conform/scripts/test-script-single.json b/clutter/tests/conform/scripts/test-script-single.json
similarity index 100%
rename from tests/conform/scripts/test-script-single.json
rename to clutter/tests/conform/scripts/test-script-single.json
diff --git a/tests/conform/scripts/test-script-timeline-markers.json b/clutter/tests/conform/scripts/test-script-timeline-markers.json
similarity index 100%
rename from tests/conform/scripts/test-script-timeline-markers.json
rename to clutter/tests/conform/scripts/test-script-timeline-markers.json
diff --git a/tests/conform/scripts/test-state-1.json b/clutter/tests/conform/scripts/test-state-1.json
similarity index 100%
rename from tests/conform/scripts/test-state-1.json
rename to clutter/tests/conform/scripts/test-state-1.json
diff --git a/tests/conform/state.c b/clutter/tests/conform/state.c
similarity index 100%
rename from tests/conform/state.c
rename to clutter/tests/conform/state.c
diff --git a/tests/conform/text-cache.c b/clutter/tests/conform/text-cache.c
similarity index 100%
rename from tests/conform/text-cache.c
rename to clutter/tests/conform/text-cache.c
diff --git a/tests/conform/text.c b/clutter/tests/conform/text.c
similarity index 100%
rename from tests/conform/text.c
rename to clutter/tests/conform/text.c
diff --git a/tests/conform/texture-fbo.c b/clutter/tests/conform/texture-fbo.c
similarity index 100%
rename from tests/conform/texture-fbo.c
rename to clutter/tests/conform/texture-fbo.c
diff --git a/tests/conform/texture.c b/clutter/tests/conform/texture.c
similarity index 100%
rename from tests/conform/texture.c
rename to clutter/tests/conform/texture.c
diff --git a/tests/conform/timeline-interpolate.c b/clutter/tests/conform/timeline-interpolate.c
similarity index 100%
rename from tests/conform/timeline-interpolate.c
rename to clutter/tests/conform/timeline-interpolate.c
diff --git a/tests/conform/timeline-progress.c b/clutter/tests/conform/timeline-progress.c
similarity index 100%
rename from tests/conform/timeline-progress.c
rename to clutter/tests/conform/timeline-progress.c
diff --git a/tests/conform/timeline-rewind.c b/clutter/tests/conform/timeline-rewind.c
similarity index 100%
rename from tests/conform/timeline-rewind.c
rename to clutter/tests/conform/timeline-rewind.c
diff --git a/tests/conform/timeline.c b/clutter/tests/conform/timeline.c
similarity index 100%
rename from tests/conform/timeline.c
rename to clutter/tests/conform/timeline.c
diff --git a/tests/conform/units.c b/clutter/tests/conform/units.c
similarity index 100%
rename from tests/conform/units.c
rename to clutter/tests/conform/units.c
diff --git a/tests/interactive/Makefile.am b/clutter/tests/interactive/Makefile.am
similarity index 100%
rename from tests/interactive/Makefile.am
rename to clutter/tests/interactive/Makefile.am
diff --git a/tests/interactive/redhand.png b/clutter/tests/interactive/redhand.png
similarity index 100%
rename from tests/interactive/redhand.png
rename to clutter/tests/interactive/redhand.png
diff --git a/tests/interactive/test-actors.c b/clutter/tests/interactive/test-actors.c
similarity index 100%
rename from tests/interactive/test-actors.c
rename to clutter/tests/interactive/test-actors.c
diff --git a/tests/interactive/test-animation.c b/clutter/tests/interactive/test-animation.c
similarity index 100%
rename from tests/interactive/test-animation.c
rename to clutter/tests/interactive/test-animation.c
diff --git a/tests/interactive/test-animator.c b/clutter/tests/interactive/test-animator.c
similarity index 100%
rename from tests/interactive/test-animator.c
rename to clutter/tests/interactive/test-animator.c
diff --git a/tests/interactive/test-bind-constraint.c b/clutter/tests/interactive/test-bind-constraint.c
similarity index 100%
rename from tests/interactive/test-bind-constraint.c
rename to clutter/tests/interactive/test-bind-constraint.c
diff --git a/tests/interactive/test-binding-pool.c b/clutter/tests/interactive/test-binding-pool.c
similarity index 100%
rename from tests/interactive/test-binding-pool.c
rename to clutter/tests/interactive/test-binding-pool.c
diff --git a/tests/interactive/test-cairo-clock.c b/clutter/tests/interactive/test-cairo-clock.c
similarity index 100%
rename from tests/interactive/test-cairo-clock.c
rename to clutter/tests/interactive/test-cairo-clock.c
diff --git a/tests/interactive/test-cairo-flowers.c b/clutter/tests/interactive/test-cairo-flowers.c
similarity index 100%
rename from tests/interactive/test-cairo-flowers.c
rename to clutter/tests/interactive/test-cairo-flowers.c
diff --git a/tests/interactive/test-clip.c b/clutter/tests/interactive/test-clip.c
similarity index 100%
rename from tests/interactive/test-clip.c
rename to clutter/tests/interactive/test-clip.c
diff --git a/tests/interactive/test-cogl-multitexture.c b/clutter/tests/interactive/test-cogl-multitexture.c
similarity index 100%
rename from tests/interactive/test-cogl-multitexture.c
rename to clutter/tests/interactive/test-cogl-multitexture.c
diff --git a/tests/interactive/test-cogl-offscreen.c b/clutter/tests/interactive/test-cogl-offscreen.c
similarity index 100%
rename from tests/interactive/test-cogl-offscreen.c
rename to clutter/tests/interactive/test-cogl-offscreen.c
diff --git a/tests/interactive/test-cogl-point-sprites.c b/clutter/tests/interactive/test-cogl-point-sprites.c
similarity index 100%
rename from tests/interactive/test-cogl-point-sprites.c
rename to clutter/tests/interactive/test-cogl-point-sprites.c
diff --git a/tests/interactive/test-cogl-primitives.c b/clutter/tests/interactive/test-cogl-primitives.c
similarity index 100%
rename from tests/interactive/test-cogl-primitives.c
rename to clutter/tests/interactive/test-cogl-primitives.c
diff --git a/tests/interactive/test-cogl-shader-arbfp.c b/clutter/tests/interactive/test-cogl-shader-arbfp.c
similarity index 100%
rename from tests/interactive/test-cogl-shader-arbfp.c
rename to clutter/tests/interactive/test-cogl-shader-arbfp.c
diff --git a/tests/interactive/test-cogl-shader-glsl.c b/clutter/tests/interactive/test-cogl-shader-glsl.c
similarity index 100%
rename from tests/interactive/test-cogl-shader-glsl.c
rename to clutter/tests/interactive/test-cogl-shader-glsl.c
diff --git a/tests/interactive/test-cogl-tex-convert.c b/clutter/tests/interactive/test-cogl-tex-convert.c
similarity index 100%
rename from tests/interactive/test-cogl-tex-convert.c
rename to clutter/tests/interactive/test-cogl-tex-convert.c
diff --git a/tests/interactive/test-cogl-tex-foreign.c b/clutter/tests/interactive/test-cogl-tex-foreign.c
similarity index 100%
rename from tests/interactive/test-cogl-tex-foreign.c
rename to clutter/tests/interactive/test-cogl-tex-foreign.c
diff --git a/tests/interactive/test-cogl-tex-getset.c b/clutter/tests/interactive/test-cogl-tex-getset.c
similarity index 100%
rename from tests/interactive/test-cogl-tex-getset.c
rename to clutter/tests/interactive/test-cogl-tex-getset.c
diff --git a/tests/interactive/test-cogl-tex-polygon.c b/clutter/tests/interactive/test-cogl-tex-polygon.c
similarity index 100%
rename from tests/interactive/test-cogl-tex-polygon.c
rename to clutter/tests/interactive/test-cogl-tex-polygon.c
diff --git a/tests/interactive/test-cogl-tex-tile.c b/clutter/tests/interactive/test-cogl-tex-tile.c
similarity index 100%
rename from tests/interactive/test-cogl-tex-tile.c
rename to clutter/tests/interactive/test-cogl-tex-tile.c
diff --git a/tests/interactive/test-cogl-vertex-buffer.c b/clutter/tests/interactive/test-cogl-vertex-buffer.c
similarity index 100%
rename from tests/interactive/test-cogl-vertex-buffer.c
rename to clutter/tests/interactive/test-cogl-vertex-buffer.c
diff --git a/tests/interactive/test-content.c b/clutter/tests/interactive/test-content.c
similarity index 100%
rename from tests/interactive/test-content.c
rename to clutter/tests/interactive/test-content.c
diff --git a/tests/interactive/test-depth.c b/clutter/tests/interactive/test-depth.c
similarity index 100%
rename from tests/interactive/test-depth.c
rename to clutter/tests/interactive/test-depth.c
diff --git a/tests/interactive/test-devices.c b/clutter/tests/interactive/test-devices.c
similarity index 100%
rename from tests/interactive/test-devices.c
rename to clutter/tests/interactive/test-devices.c
diff --git a/tests/interactive/test-easing.c b/clutter/tests/interactive/test-easing.c
similarity index 100%
rename from tests/interactive/test-easing.c
rename to clutter/tests/interactive/test-easing.c
diff --git a/tests/interactive/test-events.c b/clutter/tests/interactive/test-events.c
similarity index 100%
rename from tests/interactive/test-events.c
rename to clutter/tests/interactive/test-events.c
diff --git a/tests/interactive/test-fbo.c b/clutter/tests/interactive/test-fbo.c
similarity index 100%
rename from tests/interactive/test-fbo.c
rename to clutter/tests/interactive/test-fbo.c
diff --git a/tests/interactive/test-grab.c b/clutter/tests/interactive/test-grab.c
similarity index 100%
rename from tests/interactive/test-grab.c
rename to clutter/tests/interactive/test-grab.c
diff --git a/tests/interactive/test-image.c b/clutter/tests/interactive/test-image.c
similarity index 100%
rename from tests/interactive/test-image.c
rename to clutter/tests/interactive/test-image.c
diff --git a/tests/interactive/test-keyframe-transition.c b/clutter/tests/interactive/test-keyframe-transition.c
similarity index 100%
rename from tests/interactive/test-keyframe-transition.c
rename to clutter/tests/interactive/test-keyframe-transition.c
diff --git a/tests/interactive/test-layout.c b/clutter/tests/interactive/test-layout.c
similarity index 100%
rename from tests/interactive/test-layout.c
rename to clutter/tests/interactive/test-layout.c
diff --git a/tests/interactive/test-main.c b/clutter/tests/interactive/test-main.c
similarity index 100%
rename from tests/interactive/test-main.c
rename to clutter/tests/interactive/test-main.c
diff --git a/tests/interactive/test-multistage.c b/clutter/tests/interactive/test-multistage.c
similarity index 100%
rename from tests/interactive/test-multistage.c
rename to clutter/tests/interactive/test-multistage.c
diff --git a/tests/interactive/test-paint-wrapper.c b/clutter/tests/interactive/test-paint-wrapper.c
similarity index 100%
rename from tests/interactive/test-paint-wrapper.c
rename to clutter/tests/interactive/test-paint-wrapper.c
diff --git a/tests/interactive/test-path-constraint.c b/clutter/tests/interactive/test-path-constraint.c
similarity index 100%
rename from tests/interactive/test-path-constraint.c
rename to clutter/tests/interactive/test-path-constraint.c
diff --git a/tests/interactive/test-pixmap.c b/clutter/tests/interactive/test-pixmap.c
similarity index 100%
rename from tests/interactive/test-pixmap.c
rename to clutter/tests/interactive/test-pixmap.c
diff --git a/tests/interactive/test-rotate-zoom.c b/clutter/tests/interactive/test-rotate-zoom.c
similarity index 100%
rename from tests/interactive/test-rotate-zoom.c
rename to clutter/tests/interactive/test-rotate-zoom.c
diff --git a/tests/interactive/test-scale.c b/clutter/tests/interactive/test-scale.c
similarity index 100%
rename from tests/interactive/test-scale.c
rename to clutter/tests/interactive/test-scale.c
diff --git a/tests/interactive/test-script-signals.json b/clutter/tests/interactive/test-script-signals.json
similarity index 100%
rename from tests/interactive/test-script-signals.json
rename to clutter/tests/interactive/test-script-signals.json
diff --git a/tests/interactive/test-script.c b/clutter/tests/interactive/test-script.c
similarity index 100%
rename from tests/interactive/test-script.c
rename to clutter/tests/interactive/test-script.c
diff --git a/tests/interactive/test-script.json b/clutter/tests/interactive/test-script.json
similarity index 100%
rename from tests/interactive/test-script.json
rename to clutter/tests/interactive/test-script.json
diff --git a/tests/interactive/test-scrolling.c b/clutter/tests/interactive/test-scrolling.c
similarity index 100%
rename from tests/interactive/test-scrolling.c
rename to clutter/tests/interactive/test-scrolling.c
diff --git a/tests/interactive/test-shader-effects.c b/clutter/tests/interactive/test-shader-effects.c
similarity index 100%
rename from tests/interactive/test-shader-effects.c
rename to clutter/tests/interactive/test-shader-effects.c
diff --git a/tests/interactive/test-stage-read-pixels.c b/clutter/tests/interactive/test-stage-read-pixels.c
similarity index 100%
rename from tests/interactive/test-stage-read-pixels.c
rename to clutter/tests/interactive/test-stage-read-pixels.c
diff --git a/tests/interactive/test-stage-sizing.c b/clutter/tests/interactive/test-stage-sizing.c
similarity index 100%
rename from tests/interactive/test-stage-sizing.c
rename to clutter/tests/interactive/test-stage-sizing.c
diff --git a/tests/interactive/test-state-animator.c b/clutter/tests/interactive/test-state-animator.c
similarity index 100%
rename from tests/interactive/test-state-animator.c
rename to clutter/tests/interactive/test-state-animator.c
diff --git a/tests/interactive/test-state-script.c b/clutter/tests/interactive/test-state-script.c
similarity index 100%
rename from tests/interactive/test-state-script.c
rename to clutter/tests/interactive/test-state-script.c
diff --git a/tests/interactive/test-state.c b/clutter/tests/interactive/test-state.c
similarity index 100%
rename from tests/interactive/test-state.c
rename to clutter/tests/interactive/test-state.c
diff --git a/tests/interactive/test-swipe-action.c b/clutter/tests/interactive/test-swipe-action.c
similarity index 100%
rename from tests/interactive/test-swipe-action.c
rename to clutter/tests/interactive/test-swipe-action.c
diff --git a/tests/interactive/test-table-layout.c b/clutter/tests/interactive/test-table-layout.c
similarity index 100%
rename from tests/interactive/test-table-layout.c
rename to clutter/tests/interactive/test-table-layout.c
diff --git a/tests/interactive/test-text-field.c b/clutter/tests/interactive/test-text-field.c
similarity index 100%
rename from tests/interactive/test-text-field.c
rename to clutter/tests/interactive/test-text-field.c
diff --git a/tests/interactive/test-text.c b/clutter/tests/interactive/test-text.c
similarity index 100%
rename from tests/interactive/test-text.c
rename to clutter/tests/interactive/test-text.c
diff --git a/tests/interactive/test-texture-async.c b/clutter/tests/interactive/test-texture-async.c
similarity index 100%
rename from tests/interactive/test-texture-async.c
rename to clutter/tests/interactive/test-texture-async.c
diff --git a/tests/interactive/test-texture-material.c b/clutter/tests/interactive/test-texture-material.c
similarity index 100%
rename from tests/interactive/test-texture-material.c
rename to clutter/tests/interactive/test-texture-material.c
diff --git a/tests/interactive/test-texture-quality.c b/clutter/tests/interactive/test-texture-quality.c
similarity index 100%
rename from tests/interactive/test-texture-quality.c
rename to clutter/tests/interactive/test-texture-quality.c
diff --git a/tests/interactive/test-texture-slicing.c b/clutter/tests/interactive/test-texture-slicing.c
similarity index 100%
rename from tests/interactive/test-texture-slicing.c
rename to clutter/tests/interactive/test-texture-slicing.c
diff --git a/tests/interactive/test-touch-events.c b/clutter/tests/interactive/test-touch-events.c
similarity index 100%
rename from tests/interactive/test-touch-events.c
rename to clutter/tests/interactive/test-touch-events.c
diff --git a/tests/interactive/wrapper.sh.in b/clutter/tests/interactive/wrapper.sh.in
similarity index 100%
rename from tests/interactive/wrapper.sh.in
rename to clutter/tests/interactive/wrapper.sh.in
diff --git a/tests/micro-bench/Makefile.am b/clutter/tests/micro-bench/Makefile.am
similarity index 100%
rename from tests/micro-bench/Makefile.am
rename to clutter/tests/micro-bench/Makefile.am
diff --git a/tests/micro-bench/test-cogl-perf.c b/clutter/tests/micro-bench/test-cogl-perf.c
similarity index 100%
rename from tests/micro-bench/test-cogl-perf.c
rename to clutter/tests/micro-bench/test-cogl-perf.c
diff --git a/tests/micro-bench/test-picking.c b/clutter/tests/micro-bench/test-picking.c
similarity index 100%
rename from tests/micro-bench/test-picking.c
rename to clutter/tests/micro-bench/test-picking.c
diff --git a/tests/micro-bench/test-random-text.c b/clutter/tests/micro-bench/test-random-text.c
similarity index 100%
rename from tests/micro-bench/test-random-text.c
rename to clutter/tests/micro-bench/test-random-text.c
diff --git a/tests/micro-bench/test-text-perf.c b/clutter/tests/micro-bench/test-text-perf.c
similarity index 100%
rename from tests/micro-bench/test-text-perf.c
rename to clutter/tests/micro-bench/test-text-perf.c
diff --git a/tests/micro-bench/test-text.c b/clutter/tests/micro-bench/test-text.c
similarity index 100%
rename from tests/micro-bench/test-text.c
rename to clutter/tests/micro-bench/test-text.c
diff --git a/tests/performance/Makefile-retrospect b/clutter/tests/performance/Makefile-retrospect
similarity index 100%
rename from tests/performance/Makefile-retrospect
rename to clutter/tests/performance/Makefile-retrospect
diff --git a/tests/performance/Makefile-tests b/clutter/tests/performance/Makefile-tests
similarity index 100%
rename from tests/performance/Makefile-tests
rename to clutter/tests/performance/Makefile-tests
diff --git a/tests/performance/Makefile.am b/clutter/tests/performance/Makefile.am
similarity index 100%
rename from tests/performance/Makefile.am
rename to clutter/tests/performance/Makefile.am
diff --git a/tests/performance/create-report.rb b/clutter/tests/performance/create-report.rb
similarity index 100%
rename from tests/performance/create-report.rb
rename to clutter/tests/performance/create-report.rb
diff --git a/tests/performance/joblist b/clutter/tests/performance/joblist
similarity index 100%
rename from tests/performance/joblist
rename to clutter/tests/performance/joblist
diff --git a/tests/performance/makejobs.rb b/clutter/tests/performance/makejobs.rb
similarity index 100%
rename from tests/performance/makejobs.rb
rename to clutter/tests/performance/makejobs.rb
diff --git a/tests/performance/test-common.h b/clutter/tests/performance/test-common.h
similarity index 100%
rename from tests/performance/test-common.h
rename to clutter/tests/performance/test-common.h
diff --git a/tests/performance/test-picking.c b/clutter/tests/performance/test-picking.c
similarity index 100%
rename from tests/performance/test-picking.c
rename to clutter/tests/performance/test-picking.c
diff --git a/tests/performance/test-state-hidden.c b/clutter/tests/performance/test-state-hidden.c
similarity index 100%
rename from tests/performance/test-state-hidden.c
rename to clutter/tests/performance/test-state-hidden.c
diff --git a/tests/performance/test-state-interactive.c b/clutter/tests/performance/test-state-interactive.c
similarity index 100%
rename from tests/performance/test-state-interactive.c
rename to clutter/tests/performance/test-state-interactive.c
diff --git a/tests/performance/test-state-mini.c b/clutter/tests/performance/test-state-mini.c
similarity index 100%
rename from tests/performance/test-state-mini.c
rename to clutter/tests/performance/test-state-mini.c
diff --git a/tests/performance/test-state-pick.c b/clutter/tests/performance/test-state-pick.c
similarity index 100%
rename from tests/performance/test-state-pick.c
rename to clutter/tests/performance/test-state-pick.c
diff --git a/tests/performance/test-state.c b/clutter/tests/performance/test-state.c
similarity index 100%
rename from tests/performance/test-state.c
rename to clutter/tests/performance/test-state.c
diff --git a/tests/performance/test-text-perf.c b/clutter/tests/performance/test-text-perf.c
similarity index 100%
rename from tests/performance/test-text-perf.c
rename to clutter/tests/performance/test-text-perf.c