diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 25f12fffc..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-SUBDIRS = test-fixtures
-
-SUBDIRS += cogl
-
-if BUILD_COGL_PATH
-SUBDIRS += cogl-path
-endif
-
-if BUILD_COGL_PANGO
-SUBDIRS += cogl-pango
-endif
-
-if BUILD_COGL_GLES2
-SUBDIRS += cogl-gles2
-endif
-
-SUBDIRS += tests
-
-ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = \
-	config-custom.h
-
-# .changelog expects these to be initializes
-CLEANFILES=
-DISTCLEANFILES=
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-maintainer-flags \
-	--enable-profile \
-	--enable-gles2 \
-	--enable-gl \
-	--enable-xlib-egl-platform \
-	--enable-wayland-egl-platform \
-	--enable-glx \
-	--enable-wayland-egl-server  \
-	--enable-cogl-gst
diff --git a/.gitignore b/cogl/.gitignore
similarity index 100%
rename from .gitignore
rename to cogl/.gitignore
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index e34c76806..25f12fffc 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -1,547 +1,37 @@
-# preamble
+SUBDIRS = test-fixtures
 
-NULL =
+SUBDIRS += cogl
 
-SUBDIRS =
-
-BUILT_SOURCES =
-
-EXTRA_DIST =
-CLEANFILES =
-DISTCLEANFILES =
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	-I$(srcdir)/deprecated			\
-	-I$(srcdir)/winsys 			\
-	-I$(srcdir)/driver/gl 			\
-	-I$(srcdir)/driver/gl/gl 		\
-	-I$(srcdir)/driver/gl/gles 		\
-	$(NULL)
-
-AM_CPPFLAGS += \
-	-DG_LOG_DOMAIN=\"Cogl\" 	\
-	-DCOGL_COMPILATION		\
-	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
-	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
-	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
-	-DCOGL_LOCALEDIR=\""$(localedir)"\" \
-	$(NULL)
-
-if HAVE_COGL_DEFAULT_DRIVER
-AM_CPPFLAGS += \
-	-DCOGL_DEFAULT_DRIVER=\"$(COGL_DEFAULT_DRIVER)\"
+if BUILD_COGL_PATH
+SUBDIRS += cogl-path
 endif
 
-
-AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
-
-BUILT_SOURCES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
-DISTCLEANFILES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
-EXTRA_DIST += cogl-defines.h.in cogl-egl-defines.h.in cogl-gl-header.h.in
-
-pc_files = mutter-cogl-1.0.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pc_files)
-
-DISTCLEANFILES += $(pc_files)
-
-cogl_deprecated_h = \
-	deprecated/cogl-clip-state.h 		\
-	deprecated/cogl-fixed.h 		\
-	deprecated/cogl-material-compat.h 	\
-	deprecated/cogl-vertex-buffer.h 	\
-	deprecated/cogl-shader.h 		\
-	deprecated/cogl-clutter.h       	\
-	deprecated/cogl-type-casts.h       	\
-	deprecated/cogl-framebuffer-deprecated.h \
-	deprecated/cogl-texture-deprecated.h	\
-	deprecated/cogl-auto-texture.h	\
-	$(NULL)
-
-# public 1.x api headers
-cogl_1_public_h = \
-	$(cogl_deprecated_h)			\
-	cogl1-context.h 		\
-	cogl-bitmap.h 		\
-	cogl-color.h 			\
-	cogl-matrix.h 		\
-	cogl-offscreen.h 		\
-	cogl-primitives.h 		\
-	cogl-texture.h 		\
-	cogl-types.h 			\
-	cogl.h			\
-	$(NULL)
-
-# experimental 2.0 api headers
-# Note: we don't run glib-mkenums over these headers
-cogl_experimental_h = \
-	cogl-object.h 		\
-	cogl-renderer.h 		\
-	cogl-swap-chain.h 		\
-	cogl-onscreen-template.h 	\
-	cogl-display.h 		\
-	cogl-context.h 		\
-	cogl-pipeline.h 		\
-	cogl-pipeline-state.h 	\
-	cogl-pipeline-layer-state.h 	\
-	cogl-snippet.h		\
-	cogl-gles2.h			\
-	cogl-gles2-types.h		\
-	cogl-index-buffer.h 		\
-	cogl-attribute-buffer.h 	\
-	cogl-indices.h 		\
-	cogl-attribute.h 		\
-	cogl-primitive.h 		\
-	cogl-framebuffer.h		\
-	cogl-onscreen.h		\
-	cogl-frame-info.h		\
-	cogl-vector.h 		\
-	cogl-euler.h 			\
-	cogl-output.h			\
-	cogl-quaternion.h 		\
-	cogl-matrix-stack.h		\
-	cogl-poll.h			\
-	cogl-texture-3d.h             \
-	cogl-texture-2d.h             \
-	cogl-texture-2d-gl.h 		\
-	cogl-texture-rectangle.h      \
-	cogl-texture-2d-sliced.h      \
-	cogl-sub-texture.h            \
-	cogl-atlas-texture.h          \
-	cogl-meta-texture.h		\
-	cogl-primitive-texture.h	\
-	cogl-depth-state.h 		\
-	cogl-buffer.h 		\
-	cogl-pixel-buffer.h		\
-	cogl2-experimental.h		\
-	cogl-macros.h			\
-	cogl-fence.h       		\
-	cogl-version.h		\
-	cogl-error.h			\
-	$(NULL)
-
-cogl_additional_experimental_h = \
-	cogl-bitmap.h			\
-	cogl-color.h			\
-	cogl-matrix.h			\
-	cogl-texture.h		\
-	cogl-types.h			\
-	cogl-gtype-private.h		\
-	$(NULL)
-
-cogl_nodist_experimental_h = \
-	$(NULL)
-
-# nop driver
-cogl_driver_sources = \
-	driver/nop/cogl-driver-nop.c \
-	driver/nop/cogl-framebuffer-nop-private.h \
-	driver/nop/cogl-framebuffer-nop.c \
-	driver/nop/cogl-attribute-nop-private.h \
-	driver/nop/cogl-attribute-nop.c \
-	driver/nop/cogl-clip-stack-nop-private.h \
-	driver/nop/cogl-clip-stack-nop.c \
-	driver/nop/cogl-texture-2d-nop-private.h \
-	driver/nop/cogl-texture-2d-nop.c \
-	$(NULL)
-
-# gl driver sources
-cogl_gl_prototypes_h = \
-	gl-prototypes/cogl-gles2-functions.h		\
-	gl-prototypes/cogl-core-functions.h		\
-	gl-prototypes/cogl-in-gles-core-functions.h	\
-	gl-prototypes/cogl-in-gles2-core-functions.h	\
-	gl-prototypes/cogl-glsl-functions.h		\
-	$(NULL)
-
-cogl_driver_sources += \
-	driver/gl/cogl-util-gl-private.h \
-	driver/gl/cogl-util-gl.c \
-	driver/gl/cogl-framebuffer-gl-private.h \
-	driver/gl/cogl-framebuffer-gl.c \
-	driver/gl/cogl-texture-gl-private.h \
-	driver/gl/cogl-texture-gl.c \
-	driver/gl/cogl-texture-2d-gl-private.h \
-	driver/gl/cogl-texture-2d-gl.c \
-	driver/gl/cogl-attribute-gl-private.h \
-	driver/gl/cogl-attribute-gl.c \
-	driver/gl/cogl-clip-stack-gl-private.h \
-	driver/gl/cogl-clip-stack-gl.c \
-	driver/gl/cogl-buffer-gl-private.h \
-	driver/gl/cogl-buffer-gl.c \
-	driver/gl/cogl-pipeline-opengl.c \
-	driver/gl/cogl-pipeline-opengl-private.h \
-	driver/gl/cogl-pipeline-fragend-glsl.c \
-	driver/gl/cogl-pipeline-fragend-glsl-private.h \
-	driver/gl/gl/cogl-pipeline-fragend-arbfp.c \
-	driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h \
-	driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c \
-	driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h \
-	driver/gl/cogl-pipeline-fragend-fixed.c \
-	driver/gl/cogl-pipeline-fragend-fixed-private.h \
-	driver/gl/cogl-pipeline-vertend-glsl.c \
-	driver/gl/cogl-pipeline-vertend-glsl-private.h \
-	driver/gl/cogl-pipeline-vertend-fixed.c \
-	driver/gl/cogl-pipeline-vertend-fixed-private.h \
-	driver/gl/cogl-pipeline-progend-fixed.c \
-	driver/gl/cogl-pipeline-progend-fixed-private.h \
-	driver/gl/cogl-pipeline-progend-glsl.c \
-	driver/gl/cogl-pipeline-progend-glsl-private.h \
-	$(NULL)
-
-if COGL_DRIVER_GL_SUPPORTED
-cogl_driver_sources += \
-	driver/gl/gl/cogl-driver-gl.c \
-	driver/gl/gl/cogl-texture-driver-gl.c \
-	$(NULL)
+if BUILD_COGL_PANGO
+SUBDIRS += cogl-pango
 endif
 
-if COGL_DRIVER_GLES_SUPPORTED
-cogl_driver_sources += \
-	driver/gl/gles/cogl-driver-gles.c \
-	driver/gl/gles/cogl-texture-driver-gles.c	\
-	$(NULL)
+if BUILD_COGL_GLES2
+SUBDIRS += cogl-gles2
 endif
 
-# winsys sources, common to all backends
-cogl_winsys_common_sources = \
-	winsys/cogl-winsys-private.h \
-	winsys/cogl-winsys.c \
-	$(NULL)
+SUBDIRS += tests
 
-# sources
-cogl_sources_c = \
-	$(cogl_driver_sources)				\
-	$(cogl_winsys_common_sources)			\
-	cogl-private.h			\
-	cogl-i18n-private.h 			\
-	cogl-debug.h 				\
-	cogl-debug-options.h			\
-	cogl-gpu-info.c			\
-	cogl-gpu-info-private.h		\
-	cogl-context-private.h		\
-	cogl-context.c			\
-	cogl-renderer-private.h		\
-	cogl-renderer.h			\
-	cogl-renderer.c			\
-	cogl-swap-chain-private.h		\
-	cogl-swap-chain.h			\
-	cogl-swap-chain.c			\
-	cogl-onscreen-template-private.h 	\
-	cogl-onscreen-template.h 		\
-	cogl-onscreen-template.c 		\
-	cogl-display-private.h		\
-	cogl-display.h			\
-	cogl-display.c			\
-	cogl-driver.h				\
-	cogl.c				\
-	cogl-object-private.h			\
-	cogl-object.h				\
-	cogl-object.c				\
-	cogl-util.h 				\
-	cogl-util.c 				\
-	cogl-bitmap-private.h 		\
-	cogl-bitmap.c 			\
-	cogl-bitmap-conversion.c 		\
-	cogl-bitmap-packing.h			\
-	cogl-primitives-private.h 		\
-	cogl-primitives.h 			\
-	cogl-primitives.c 			\
-	cogl-bitmap-pixbuf.c 			\
-	cogl-clip-stack.h 			\
-	cogl-clip-stack.c			\
-	cogl-feature-private.h                \
-	cogl-feature-private.c                \
-	cogl-color-private.h    		\
-	cogl-color.c				\
-	cogl-buffer-private.h 		\
-	cogl-buffer.c				\
-	cogl-pixel-buffer-private.h		\
-	cogl-pixel-buffer.c			\
-	cogl-index-buffer-private.h		\
-	cogl-index-buffer.c			\
-	cogl-attribute-buffer-private.h	\
-	cogl-attribute-buffer.c		\
-	cogl-indices-private.h		\
-	cogl-indices.c			\
-	cogl-attribute-private.h		\
-	cogl-attribute.c			\
-	cogl-primitive-private.h		\
-	cogl-primitive.c			\
-	cogl-matrix.c				\
-	cogl-vector.c				\
-	cogl-euler.c				\
-	cogl-quaternion-private.h 		\
-	cogl-quaternion.c			\
-	cogl-matrix-private.h			\
-	cogl-matrix-stack.c			\
-	cogl-matrix-stack-private.h		\
-	cogl-depth-state.c			\
-	cogl-depth-state-private.h		\
-	cogl-node.c				\
-	cogl-node-private.h			\
-	cogl-pipeline.c			\
-	cogl-pipeline-private.h		\
-	cogl-pipeline-layer.c			\
-	cogl-pipeline-layer-private.h		\
-	cogl-pipeline-state.c			\
-	cogl-pipeline-layer-state-private.h	\
-	cogl-pipeline-layer-state.c		\
-	cogl-pipeline-state-private.h		\
-	cogl-pipeline-debug.c			\
-        cogl-glsl-shader.c                    \
-        cogl-glsl-shader-private.h            \
-        cogl-glsl-shader-boilerplate.h        \
-	cogl-pipeline-snippet-private.h	\
-	cogl-pipeline-snippet.c		\
-	cogl-pipeline-cache.h			\
-	cogl-pipeline-cache.c			\
-	cogl-pipeline-hash-table.h		\
-	cogl-pipeline-hash-table.c		\
-	cogl-sampler-cache.c			\
-	cogl-sampler-cache-private.h		\
-	cogl-blend-string.c			\
-	cogl-blend-string.h			\
-	cogl-debug.c				\
-	cogl-sub-texture-private.h            \
-	cogl-texture-private.h		\
-	cogl-texture-2d-private.h             \
-	cogl-texture-2d-sliced-private.h 	\
-	cogl-texture-3d-private.h             \
-	cogl-texture-driver.h			\
-	cogl-sub-texture.c                    \
-	cogl-texture.c			\
-	cogl-texture-2d.c                     \
-	cogl-texture-2d-sliced.c		\
-	cogl-texture-3d.c                     \
-	cogl-texture-rectangle-private.h      \
-	cogl-texture-rectangle.c              \
-	cogl-rectangle-map.h                  \
-	cogl-rectangle-map.c                  \
-	cogl-atlas.h                          \
-	cogl-atlas.c                          \
-	cogl-atlas-texture-private.h          \
-	cogl-atlas-texture.c                  \
-	cogl-meta-texture.c			\
-	cogl-primitive-texture.c		\
-	cogl-blit.h				\
-	cogl-blit.c				\
-	cogl-spans.h				\
-	cogl-spans.c				\
-	cogl-journal-private.h		\
-	cogl-journal.c			\
-	cogl-frame-info-private.h		\
-	cogl-frame-info.c			\
-	cogl-framebuffer-private.h		\
-	cogl-framebuffer.c 			\
-	cogl-onscreen-private.h		\
-	cogl-onscreen.c 			\
-	cogl-output-private.h			\
-	cogl-output.c				\
-	cogl-profile.h 			\
-	cogl-profile.c 			\
-	cogl-flags.h				\
-	cogl-bitmask.h                        \
-	cogl-bitmask.c                        \
-	cogl-gtype.c                          \
-	cogl-gtype-private.h                  \
-	cogl-point-in-poly-private.h       	\
-	cogl-point-in-poly.c       		\
-	cogl-list.c				\
-	cogl-list.h				\
-	winsys/cogl-winsys-stub-private.h	\
-	winsys/cogl-winsys-stub.c		\
-	cogl-config-private.h			\
-	cogl-config.c				\
-	cogl-boxed-value.h			\
-	cogl-boxed-value.c			\
-	cogl-snippet-private.h		\
-	cogl-snippet.c			\
-	cogl-poll-private.h			\
-	cogl-poll.c				\
-	gl-prototypes/cogl-all-functions.h	\
-	gl-prototypes/cogl-gles1-functions.h	\
-	gl-prototypes/cogl-gles2-functions.h	\
-	gl-prototypes/cogl-core-functions.h	\
-	gl-prototypes/cogl-in-gles-core-functions.h	\
-	gl-prototypes/cogl-in-gles1-core-functions.h	\
-	gl-prototypes/cogl-in-gles2-core-functions.h	\
-	gl-prototypes/cogl-fixed-functions.h	\
-	gl-prototypes/cogl-glsl-functions.h	\
-	cogl-memory-stack-private.h		\
-	cogl-memory-stack.c			\
-	cogl-magazine-private.h		\
-	cogl-magazine.c			\
-	cogl-gles2-context-private.h		\
-	cogl-gles2-context.c			\
-	cogl-error-private.h			\
-	cogl-error.c				\
-	cogl-closure-list-private.h		\
-	cogl-closure-list.c			\
-	cogl-fence.c				\
-	cogl-fence-private.h			\
-	deprecated/cogl-clip-state.c			\
-	deprecated/cogl-fixed.c		    	\
-	deprecated/cogl-vertex-buffer-private.h	\
-	deprecated/cogl-vertex-buffer.c		\
-	deprecated/cogl-material-compat.c		\
-	deprecated/cogl-program.c			\
-	deprecated/cogl-program-private.h		\
-	deprecated/cogl-auto-texture.c		\
-	deprecated/cogl-shader-private.h		\
-	deprecated/cogl-shader.c			\
-	deprecated/cogl-clutter.c       		\
-	deprecated/cogl-framebuffer-deprecated.c      \
-	deprecated/cogl-texture-deprecated.c       	\
-	$(NULL)
+ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 
-cogl_experimental_h += cogl-glib-source.h
-cogl_sources_c += cogl-glib-source.c
+EXTRA_DIST = \
+	config-custom.h
 
-if SUPPORT_XLIB
-cogl_deprecated_h += deprecated/cogl-clutter-xlib.h
-cogl_1_public_h += cogl-xlib-renderer.h
+# .changelog expects these to be initializes
+CLEANFILES=
+DISTCLEANFILES=
 
-cogl_experimental_h += \
-	winsys/cogl-texture-pixmap-x11.h \
-	cogl-xlib.h
-
-cogl_sources_c += \
-	cogl-x11-renderer-private.h \
-	cogl-xlib-renderer-private.h \
-	cogl-xlib-renderer.c \
-	cogl-xlib.c \
-	cogl-xlib-private.h \
-	winsys/cogl-texture-pixmap-x11.c \
-	winsys/cogl-texture-pixmap-x11-private.h
-endif
-if SUPPORT_GLX
-cogl_experimental_h += cogl-glx.h
-cogl_sources_c += \
-	cogl-glx-renderer-private.h \
-	cogl-glx-display-private.h \
-	winsys/cogl-winsys-glx-feature-functions.h \
-	winsys/cogl-winsys-glx-private.h \
-	winsys/cogl-winsys-glx.c
-endif
-if SUPPORT_WAYLAND_EGL_SERVER
-cogl_experimental_h += cogl-wayland-server.h
-endif
-if SUPPORT_EGL_PLATFORM_KMS
-cogl_experimental_h += \
-	cogl-kms-renderer.h \
-	cogl-kms-display.h
-cogl_sources_c += \
-	winsys/cogl-winsys-egl-kms.c \
-	winsys/cogl-winsys-egl-kms-private.h
-endif
-if SUPPORT_EGL_PLATFORM_XLIB
-cogl_sources_c += \
-	winsys/cogl-winsys-egl-x11.c \
-	winsys/cogl-winsys-egl-x11-private.h
-endif
-if SUPPORT_EGL
-cogl_experimental_h += cogl-egl.h
-cogl_nodist_experimental_h += cogl-egl-defines.h
-
-cogl_sources_c += \
-	cogl-egl-private.h \
-	winsys/cogl-winsys-egl.c \
-	winsys/cogl-winsys-egl-feature-functions.h \
-	winsys/cogl-winsys-egl-private.h
-endif
-
-# glib-mkenums rules
-glib_enum_h = cogl-enum-types.h
-glib_enum_c = cogl-enum-types.c
-glib_enum_headers = $(cogl_1_public_h)
-include $(top_srcdir)/build/autotools/Makefile.am.enums
-
-mutterlibdir = $(libdir)/mutter
-mutterlib_LTLIBRARIES = libmutter-cogl.la
-
-libmutter_cogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-if UNIT_TESTS
-libmutter_cogl_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la
-endif
-# XXX: The aim is to eventually get rid of all private API exports
-# for cogl-pango.
-libmutter_cogl_la_LDFLAGS = \
-	-no-undefined \
-	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
-	-export-dynamic \
-	-rpath $(mutterlibdir) \
-	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*"
-
-libmutter_cogl_la_SOURCES = $(cogl_sources_c)
-nodist_libmutter_cogl_la_SOURCES = $(BUILT_SOURCES)
-
-# Cogl installed headers
-cogl_headers = \
-	$(cogl_1_public_h) \
-	cogl-deprecated.h \
-	cogl-pango.h \
-	$(NULL)
-
-cogl_base_includedir = $(includedir)/mutter
-cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated
-cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h)
-
-coglincludedir = $(cogl_base_includedir)/cogl/cogl
-coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
-nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
-
-cogl_proto_includedir = $(cogl_base_includedir)/cogl/cogl/gl-prototypes
-cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
-
-EXTRA_DIST += \
-	cogl.symbols
-
--include $(INTROSPECTION_MAKEFILE)
-
-INTROSPECTION_GIRS =
-
-if HAVE_INTROSPECTION
-Cogl-1.0.gir: libmutter-cogl.la Makefile
-
-Cogl_1_0_gir_NAMESPACE = Cogl
-Cogl_1_0_gir_VERSION = 1.0
-Cogl_1_0_gir_LIBS = libmutter-cogl.la
-if UNIT_TESTS
-Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
-endif
-Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h
-
-Cogl-2.0.gir: libmutter-cogl.la Makefile
-
-Cogl_2_0_gir_NAMESPACE = Cogl
-Cogl_2_0_gir_VERSION = 2.0
-Cogl_2_0_gir_LIBS = libmutter-cogl.la
-if UNIT_TESTS
-Cogl_2_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
-endif
-Cogl_2_0_gir_FILES = $(cogl_experimental_h) $(cogl_additional_experimental_h) cogl-enum-types.h
-
-Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
-Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
-Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
-Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
-
-Cogl_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -DCOGL_ENABLE_EXPERIMENTAL_API=1 -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -DCOGL_GIR_SCANNING
-Cogl_2_0_gir_INCLUDES = GL-1.0 GObject-2.0
-Cogl_2_0_gir_EXPORT_PACKAGES = cogl-2.0-experimental
-Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' --symbol-prefix=cogl --symbol-prefix=cogl2
-
-INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir
-
-girdir = $(mutterlibdir)
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(mutterlibdir)
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-maintainer-flags \
+	--enable-profile \
+	--enable-gles2 \
+	--enable-gl \
+	--enable-xlib-egl-platform \
+	--enable-wayland-egl-platform \
+	--enable-glx \
+	--enable-wayland-egl-server  \
+	--enable-cogl-gst
diff --git a/build/autotools/Makefile.am.enums b/cogl/build/autotools/Makefile.am.enums
similarity index 100%
rename from build/autotools/Makefile.am.enums
rename to cogl/build/autotools/Makefile.am.enums
diff --git a/build/autotools/as-compiler-flag.m4 b/cogl/build/autotools/as-compiler-flag.m4
similarity index 100%
rename from build/autotools/as-compiler-flag.m4
rename to cogl/build/autotools/as-compiler-flag.m4
diff --git a/build/autotools/introspection.m4 b/cogl/build/autotools/introspection.m4
similarity index 100%
rename from build/autotools/introspection.m4
rename to cogl/build/autotools/introspection.m4
diff --git a/cogl-gles2/GLES2/gl2.h b/cogl/cogl-gles2/GLES2/gl2.h
similarity index 100%
rename from cogl-gles2/GLES2/gl2.h
rename to cogl/cogl-gles2/GLES2/gl2.h
diff --git a/cogl-gles2/GLES2/gl2ext.h b/cogl/cogl-gles2/GLES2/gl2ext.h
similarity index 100%
rename from cogl-gles2/GLES2/gl2ext.h
rename to cogl/cogl-gles2/GLES2/gl2ext.h
diff --git a/cogl-gles2/GLES2/gl2platform.h b/cogl/cogl-gles2/GLES2/gl2platform.h
similarity index 100%
rename from cogl-gles2/GLES2/gl2platform.h
rename to cogl/cogl-gles2/GLES2/gl2platform.h
diff --git a/cogl-gles2/Makefile.am b/cogl/cogl-gles2/Makefile.am
similarity index 100%
rename from cogl-gles2/Makefile.am
rename to cogl/cogl-gles2/Makefile.am
diff --git a/cogl-gles2/cogl-gles2-api.c b/cogl/cogl-gles2/cogl-gles2-api.c
similarity index 100%
rename from cogl-gles2/cogl-gles2-api.c
rename to cogl/cogl-gles2/cogl-gles2-api.c
diff --git a/cogl-gles2/mutter-cogl-gles2-1.0.pc.in b/cogl/cogl-gles2/mutter-cogl-gles2-1.0.pc.in
similarity index 100%
rename from cogl-gles2/mutter-cogl-gles2-1.0.pc.in
rename to cogl/cogl-gles2/mutter-cogl-gles2-1.0.pc.in
diff --git a/cogl-pango/Makefile.am b/cogl/cogl-pango/Makefile.am
similarity index 100%
rename from cogl-pango/Makefile.am
rename to cogl/cogl-pango/Makefile.am
diff --git a/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c
similarity index 100%
rename from cogl-pango/cogl-pango-display-list.c
rename to cogl/cogl-pango/cogl-pango-display-list.c
diff --git a/cogl-pango/cogl-pango-display-list.h b/cogl/cogl-pango/cogl-pango-display-list.h
similarity index 100%
rename from cogl-pango/cogl-pango-display-list.h
rename to cogl/cogl-pango/cogl-pango-display-list.h
diff --git a/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c
similarity index 100%
rename from cogl-pango/cogl-pango-fontmap.c
rename to cogl/cogl-pango/cogl-pango-fontmap.c
diff --git a/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c
similarity index 100%
rename from cogl-pango/cogl-pango-glyph-cache.c
rename to cogl/cogl-pango/cogl-pango-glyph-cache.c
diff --git a/cogl-pango/cogl-pango-glyph-cache.h b/cogl/cogl-pango/cogl-pango-glyph-cache.h
similarity index 100%
rename from cogl-pango/cogl-pango-glyph-cache.h
rename to cogl/cogl-pango/cogl-pango-glyph-cache.h
diff --git a/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
similarity index 100%
rename from cogl-pango/cogl-pango-pipeline-cache.c
rename to cogl/cogl-pango/cogl-pango-pipeline-cache.c
diff --git a/cogl-pango/cogl-pango-pipeline-cache.h b/cogl/cogl-pango/cogl-pango-pipeline-cache.h
similarity index 100%
rename from cogl-pango/cogl-pango-pipeline-cache.h
rename to cogl/cogl-pango/cogl-pango-pipeline-cache.h
diff --git a/cogl-pango/cogl-pango-private.h b/cogl/cogl-pango/cogl-pango-private.h
similarity index 100%
rename from cogl-pango/cogl-pango-private.h
rename to cogl/cogl-pango/cogl-pango-private.h
diff --git a/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
similarity index 100%
rename from cogl-pango/cogl-pango-render.c
rename to cogl/cogl-pango/cogl-pango-render.c
diff --git a/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h
similarity index 100%
rename from cogl-pango/cogl-pango.h
rename to cogl/cogl-pango/cogl-pango.h
diff --git a/cogl-pango/cogl-pango.symbols b/cogl/cogl-pango/cogl-pango.symbols
similarity index 100%
rename from cogl-pango/cogl-pango.symbols
rename to cogl/cogl-pango/cogl-pango.symbols
diff --git a/cogl-pango/mutter-cogl-pango-1.0.pc.in b/cogl/cogl-pango/mutter-cogl-pango-1.0.pc.in
similarity index 100%
rename from cogl-pango/mutter-cogl-pango-1.0.pc.in
rename to cogl/cogl-pango/mutter-cogl-pango-1.0.pc.in
diff --git a/cogl-path/Makefile.am b/cogl/cogl-path/Makefile.am
similarity index 100%
rename from cogl-path/Makefile.am
rename to cogl/cogl-path/Makefile.am
diff --git a/cogl-path/cogl-path-enum-types.c.in b/cogl/cogl-path/cogl-path-enum-types.c.in
similarity index 100%
rename from cogl-path/cogl-path-enum-types.c.in
rename to cogl/cogl-path/cogl-path-enum-types.c.in
diff --git a/cogl-path/cogl-path-enum-types.h.in b/cogl/cogl-path/cogl-path-enum-types.h.in
similarity index 100%
rename from cogl-path/cogl-path-enum-types.h.in
rename to cogl/cogl-path/cogl-path-enum-types.h.in
diff --git a/cogl-path/cogl-path-private.h b/cogl/cogl-path/cogl-path-private.h
similarity index 100%
rename from cogl-path/cogl-path-private.h
rename to cogl/cogl-path/cogl-path-private.h
diff --git a/cogl-path/cogl-path-types.h b/cogl/cogl-path/cogl-path-types.h
similarity index 100%
rename from cogl-path/cogl-path-types.h
rename to cogl/cogl-path/cogl-path-types.h
diff --git a/cogl-path/cogl-path.c b/cogl/cogl-path/cogl-path.c
similarity index 100%
rename from cogl-path/cogl-path.c
rename to cogl/cogl-path/cogl-path.c
diff --git a/cogl-path/cogl-path.h b/cogl/cogl-path/cogl-path.h
similarity index 100%
rename from cogl-path/cogl-path.h
rename to cogl/cogl-path/cogl-path.h
diff --git a/cogl-path/cogl-path.symbols b/cogl/cogl-path/cogl-path.symbols
similarity index 100%
rename from cogl-path/cogl-path.symbols
rename to cogl/cogl-path/cogl-path.symbols
diff --git a/cogl-path/cogl1-path-functions.h b/cogl/cogl-path/cogl1-path-functions.h
similarity index 100%
rename from cogl-path/cogl1-path-functions.h
rename to cogl/cogl-path/cogl1-path-functions.h
diff --git a/cogl-path/cogl1-path.c b/cogl/cogl-path/cogl1-path.c
similarity index 100%
rename from cogl-path/cogl1-path.c
rename to cogl/cogl-path/cogl1-path.c
diff --git a/cogl-path/cogl2-path-functions.h b/cogl/cogl-path/cogl2-path-functions.h
similarity index 100%
rename from cogl-path/cogl2-path-functions.h
rename to cogl/cogl-path/cogl2-path-functions.h
diff --git a/cogl-path/mutter-cogl-path-1.0.pc.in b/cogl/cogl-path/mutter-cogl-path-1.0.pc.in
similarity index 100%
rename from cogl-path/mutter-cogl-path-1.0.pc.in
rename to cogl/cogl-path/mutter-cogl-path-1.0.pc.in
diff --git a/cogl-path/tesselator/GL/glu.h b/cogl/cogl-path/tesselator/GL/glu.h
similarity index 100%
rename from cogl-path/tesselator/GL/glu.h
rename to cogl/cogl-path/tesselator/GL/glu.h
diff --git a/cogl-path/tesselator/README b/cogl/cogl-path/tesselator/README
similarity index 100%
rename from cogl-path/tesselator/README
rename to cogl/cogl-path/tesselator/README
diff --git a/cogl-path/tesselator/dict-list.h b/cogl/cogl-path/tesselator/dict-list.h
similarity index 100%
rename from cogl-path/tesselator/dict-list.h
rename to cogl/cogl-path/tesselator/dict-list.h
diff --git a/cogl-path/tesselator/dict.c b/cogl/cogl-path/tesselator/dict.c
similarity index 100%
rename from cogl-path/tesselator/dict.c
rename to cogl/cogl-path/tesselator/dict.c
diff --git a/cogl-path/tesselator/dict.h b/cogl/cogl-path/tesselator/dict.h
similarity index 100%
rename from cogl-path/tesselator/dict.h
rename to cogl/cogl-path/tesselator/dict.h
diff --git a/cogl-path/tesselator/geom.c b/cogl/cogl-path/tesselator/geom.c
similarity index 100%
rename from cogl-path/tesselator/geom.c
rename to cogl/cogl-path/tesselator/geom.c
diff --git a/cogl-path/tesselator/geom.h b/cogl/cogl-path/tesselator/geom.h
similarity index 100%
rename from cogl-path/tesselator/geom.h
rename to cogl/cogl-path/tesselator/geom.h
diff --git a/cogl-path/tesselator/gluos.h b/cogl/cogl-path/tesselator/gluos.h
similarity index 100%
rename from cogl-path/tesselator/gluos.h
rename to cogl/cogl-path/tesselator/gluos.h
diff --git a/cogl-path/tesselator/memalloc.h b/cogl/cogl-path/tesselator/memalloc.h
similarity index 100%
rename from cogl-path/tesselator/memalloc.h
rename to cogl/cogl-path/tesselator/memalloc.h
diff --git a/cogl-path/tesselator/mesh.c b/cogl/cogl-path/tesselator/mesh.c
similarity index 100%
rename from cogl-path/tesselator/mesh.c
rename to cogl/cogl-path/tesselator/mesh.c
diff --git a/cogl-path/tesselator/mesh.h b/cogl/cogl-path/tesselator/mesh.h
similarity index 100%
rename from cogl-path/tesselator/mesh.h
rename to cogl/cogl-path/tesselator/mesh.h
diff --git a/cogl-path/tesselator/normal.c b/cogl/cogl-path/tesselator/normal.c
similarity index 100%
rename from cogl-path/tesselator/normal.c
rename to cogl/cogl-path/tesselator/normal.c
diff --git a/cogl-path/tesselator/normal.h b/cogl/cogl-path/tesselator/normal.h
similarity index 100%
rename from cogl-path/tesselator/normal.h
rename to cogl/cogl-path/tesselator/normal.h
diff --git a/cogl-path/tesselator/priorityq-heap.c b/cogl/cogl-path/tesselator/priorityq-heap.c
similarity index 100%
rename from cogl-path/tesselator/priorityq-heap.c
rename to cogl/cogl-path/tesselator/priorityq-heap.c
diff --git a/cogl-path/tesselator/priorityq-heap.h b/cogl/cogl-path/tesselator/priorityq-heap.h
similarity index 100%
rename from cogl-path/tesselator/priorityq-heap.h
rename to cogl/cogl-path/tesselator/priorityq-heap.h
diff --git a/cogl-path/tesselator/priorityq-sort.h b/cogl/cogl-path/tesselator/priorityq-sort.h
similarity index 100%
rename from cogl-path/tesselator/priorityq-sort.h
rename to cogl/cogl-path/tesselator/priorityq-sort.h
diff --git a/cogl-path/tesselator/priorityq.c b/cogl/cogl-path/tesselator/priorityq.c
similarity index 100%
rename from cogl-path/tesselator/priorityq.c
rename to cogl/cogl-path/tesselator/priorityq.c
diff --git a/cogl-path/tesselator/priorityq.h b/cogl/cogl-path/tesselator/priorityq.h
similarity index 100%
rename from cogl-path/tesselator/priorityq.h
rename to cogl/cogl-path/tesselator/priorityq.h
diff --git a/cogl-path/tesselator/render.c b/cogl/cogl-path/tesselator/render.c
similarity index 100%
rename from cogl-path/tesselator/render.c
rename to cogl/cogl-path/tesselator/render.c
diff --git a/cogl-path/tesselator/render.h b/cogl/cogl-path/tesselator/render.h
similarity index 100%
rename from cogl-path/tesselator/render.h
rename to cogl/cogl-path/tesselator/render.h
diff --git a/cogl-path/tesselator/sweep.c b/cogl/cogl-path/tesselator/sweep.c
similarity index 100%
rename from cogl-path/tesselator/sweep.c
rename to cogl/cogl-path/tesselator/sweep.c
diff --git a/cogl-path/tesselator/sweep.h b/cogl/cogl-path/tesselator/sweep.h
similarity index 100%
rename from cogl-path/tesselator/sweep.h
rename to cogl/cogl-path/tesselator/sweep.h
diff --git a/cogl-path/tesselator/tess.c b/cogl/cogl-path/tesselator/tess.c
similarity index 100%
rename from cogl-path/tesselator/tess.c
rename to cogl/cogl-path/tesselator/tess.c
diff --git a/cogl-path/tesselator/tess.h b/cogl/cogl-path/tesselator/tess.h
similarity index 100%
rename from cogl-path/tesselator/tess.h
rename to cogl/cogl-path/tesselator/tess.h
diff --git a/cogl-path/tesselator/tesselator.h b/cogl/cogl-path/tesselator/tesselator.h
similarity index 100%
rename from cogl-path/tesselator/tesselator.h
rename to cogl/cogl-path/tesselator/tesselator.h
diff --git a/cogl-path/tesselator/tessmono.c b/cogl/cogl-path/tesselator/tessmono.c
similarity index 100%
rename from cogl-path/tesselator/tessmono.c
rename to cogl/cogl-path/tesselator/tessmono.c
diff --git a/cogl-path/tesselator/tessmono.h b/cogl/cogl-path/tesselator/tessmono.h
similarity index 100%
rename from cogl-path/tesselator/tessmono.h
rename to cogl/cogl-path/tesselator/tessmono.h
diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am
new file mode 100644
index 000000000..e34c76806
--- /dev/null
+++ b/cogl/cogl/Makefile.am
@@ -0,0 +1,547 @@
+# preamble
+
+NULL =
+
+SUBDIRS =
+
+BUILT_SOURCES =
+
+EXTRA_DIST =
+CLEANFILES =
+DISTCLEANFILES =
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(srcdir)/deprecated			\
+	-I$(srcdir)/winsys 			\
+	-I$(srcdir)/driver/gl 			\
+	-I$(srcdir)/driver/gl/gl 		\
+	-I$(srcdir)/driver/gl/gles 		\
+	$(NULL)
+
+AM_CPPFLAGS += \
+	-DG_LOG_DOMAIN=\"Cogl\" 	\
+	-DCOGL_COMPILATION		\
+	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
+	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
+	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
+	-DCOGL_LOCALEDIR=\""$(localedir)"\" \
+	$(NULL)
+
+if HAVE_COGL_DEFAULT_DRIVER
+AM_CPPFLAGS += \
+	-DCOGL_DEFAULT_DRIVER=\"$(COGL_DEFAULT_DRIVER)\"
+endif
+
+
+AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+
+BUILT_SOURCES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
+DISTCLEANFILES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
+EXTRA_DIST += cogl-defines.h.in cogl-egl-defines.h.in cogl-gl-header.h.in
+
+pc_files = mutter-cogl-1.0.pc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(pc_files)
+
+DISTCLEANFILES += $(pc_files)
+
+cogl_deprecated_h = \
+	deprecated/cogl-clip-state.h 		\
+	deprecated/cogl-fixed.h 		\
+	deprecated/cogl-material-compat.h 	\
+	deprecated/cogl-vertex-buffer.h 	\
+	deprecated/cogl-shader.h 		\
+	deprecated/cogl-clutter.h       	\
+	deprecated/cogl-type-casts.h       	\
+	deprecated/cogl-framebuffer-deprecated.h \
+	deprecated/cogl-texture-deprecated.h	\
+	deprecated/cogl-auto-texture.h	\
+	$(NULL)
+
+# public 1.x api headers
+cogl_1_public_h = \
+	$(cogl_deprecated_h)			\
+	cogl1-context.h 		\
+	cogl-bitmap.h 		\
+	cogl-color.h 			\
+	cogl-matrix.h 		\
+	cogl-offscreen.h 		\
+	cogl-primitives.h 		\
+	cogl-texture.h 		\
+	cogl-types.h 			\
+	cogl.h			\
+	$(NULL)
+
+# experimental 2.0 api headers
+# Note: we don't run glib-mkenums over these headers
+cogl_experimental_h = \
+	cogl-object.h 		\
+	cogl-renderer.h 		\
+	cogl-swap-chain.h 		\
+	cogl-onscreen-template.h 	\
+	cogl-display.h 		\
+	cogl-context.h 		\
+	cogl-pipeline.h 		\
+	cogl-pipeline-state.h 	\
+	cogl-pipeline-layer-state.h 	\
+	cogl-snippet.h		\
+	cogl-gles2.h			\
+	cogl-gles2-types.h		\
+	cogl-index-buffer.h 		\
+	cogl-attribute-buffer.h 	\
+	cogl-indices.h 		\
+	cogl-attribute.h 		\
+	cogl-primitive.h 		\
+	cogl-framebuffer.h		\
+	cogl-onscreen.h		\
+	cogl-frame-info.h		\
+	cogl-vector.h 		\
+	cogl-euler.h 			\
+	cogl-output.h			\
+	cogl-quaternion.h 		\
+	cogl-matrix-stack.h		\
+	cogl-poll.h			\
+	cogl-texture-3d.h             \
+	cogl-texture-2d.h             \
+	cogl-texture-2d-gl.h 		\
+	cogl-texture-rectangle.h      \
+	cogl-texture-2d-sliced.h      \
+	cogl-sub-texture.h            \
+	cogl-atlas-texture.h          \
+	cogl-meta-texture.h		\
+	cogl-primitive-texture.h	\
+	cogl-depth-state.h 		\
+	cogl-buffer.h 		\
+	cogl-pixel-buffer.h		\
+	cogl2-experimental.h		\
+	cogl-macros.h			\
+	cogl-fence.h       		\
+	cogl-version.h		\
+	cogl-error.h			\
+	$(NULL)
+
+cogl_additional_experimental_h = \
+	cogl-bitmap.h			\
+	cogl-color.h			\
+	cogl-matrix.h			\
+	cogl-texture.h		\
+	cogl-types.h			\
+	cogl-gtype-private.h		\
+	$(NULL)
+
+cogl_nodist_experimental_h = \
+	$(NULL)
+
+# nop driver
+cogl_driver_sources = \
+	driver/nop/cogl-driver-nop.c \
+	driver/nop/cogl-framebuffer-nop-private.h \
+	driver/nop/cogl-framebuffer-nop.c \
+	driver/nop/cogl-attribute-nop-private.h \
+	driver/nop/cogl-attribute-nop.c \
+	driver/nop/cogl-clip-stack-nop-private.h \
+	driver/nop/cogl-clip-stack-nop.c \
+	driver/nop/cogl-texture-2d-nop-private.h \
+	driver/nop/cogl-texture-2d-nop.c \
+	$(NULL)
+
+# gl driver sources
+cogl_gl_prototypes_h = \
+	gl-prototypes/cogl-gles2-functions.h		\
+	gl-prototypes/cogl-core-functions.h		\
+	gl-prototypes/cogl-in-gles-core-functions.h	\
+	gl-prototypes/cogl-in-gles2-core-functions.h	\
+	gl-prototypes/cogl-glsl-functions.h		\
+	$(NULL)
+
+cogl_driver_sources += \
+	driver/gl/cogl-util-gl-private.h \
+	driver/gl/cogl-util-gl.c \
+	driver/gl/cogl-framebuffer-gl-private.h \
+	driver/gl/cogl-framebuffer-gl.c \
+	driver/gl/cogl-texture-gl-private.h \
+	driver/gl/cogl-texture-gl.c \
+	driver/gl/cogl-texture-2d-gl-private.h \
+	driver/gl/cogl-texture-2d-gl.c \
+	driver/gl/cogl-attribute-gl-private.h \
+	driver/gl/cogl-attribute-gl.c \
+	driver/gl/cogl-clip-stack-gl-private.h \
+	driver/gl/cogl-clip-stack-gl.c \
+	driver/gl/cogl-buffer-gl-private.h \
+	driver/gl/cogl-buffer-gl.c \
+	driver/gl/cogl-pipeline-opengl.c \
+	driver/gl/cogl-pipeline-opengl-private.h \
+	driver/gl/cogl-pipeline-fragend-glsl.c \
+	driver/gl/cogl-pipeline-fragend-glsl-private.h \
+	driver/gl/gl/cogl-pipeline-fragend-arbfp.c \
+	driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h \
+	driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c \
+	driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h \
+	driver/gl/cogl-pipeline-fragend-fixed.c \
+	driver/gl/cogl-pipeline-fragend-fixed-private.h \
+	driver/gl/cogl-pipeline-vertend-glsl.c \
+	driver/gl/cogl-pipeline-vertend-glsl-private.h \
+	driver/gl/cogl-pipeline-vertend-fixed.c \
+	driver/gl/cogl-pipeline-vertend-fixed-private.h \
+	driver/gl/cogl-pipeline-progend-fixed.c \
+	driver/gl/cogl-pipeline-progend-fixed-private.h \
+	driver/gl/cogl-pipeline-progend-glsl.c \
+	driver/gl/cogl-pipeline-progend-glsl-private.h \
+	$(NULL)
+
+if COGL_DRIVER_GL_SUPPORTED
+cogl_driver_sources += \
+	driver/gl/gl/cogl-driver-gl.c \
+	driver/gl/gl/cogl-texture-driver-gl.c \
+	$(NULL)
+endif
+
+if COGL_DRIVER_GLES_SUPPORTED
+cogl_driver_sources += \
+	driver/gl/gles/cogl-driver-gles.c \
+	driver/gl/gles/cogl-texture-driver-gles.c	\
+	$(NULL)
+endif
+
+# winsys sources, common to all backends
+cogl_winsys_common_sources = \
+	winsys/cogl-winsys-private.h \
+	winsys/cogl-winsys.c \
+	$(NULL)
+
+# sources
+cogl_sources_c = \
+	$(cogl_driver_sources)				\
+	$(cogl_winsys_common_sources)			\
+	cogl-private.h			\
+	cogl-i18n-private.h 			\
+	cogl-debug.h 				\
+	cogl-debug-options.h			\
+	cogl-gpu-info.c			\
+	cogl-gpu-info-private.h		\
+	cogl-context-private.h		\
+	cogl-context.c			\
+	cogl-renderer-private.h		\
+	cogl-renderer.h			\
+	cogl-renderer.c			\
+	cogl-swap-chain-private.h		\
+	cogl-swap-chain.h			\
+	cogl-swap-chain.c			\
+	cogl-onscreen-template-private.h 	\
+	cogl-onscreen-template.h 		\
+	cogl-onscreen-template.c 		\
+	cogl-display-private.h		\
+	cogl-display.h			\
+	cogl-display.c			\
+	cogl-driver.h				\
+	cogl.c				\
+	cogl-object-private.h			\
+	cogl-object.h				\
+	cogl-object.c				\
+	cogl-util.h 				\
+	cogl-util.c 				\
+	cogl-bitmap-private.h 		\
+	cogl-bitmap.c 			\
+	cogl-bitmap-conversion.c 		\
+	cogl-bitmap-packing.h			\
+	cogl-primitives-private.h 		\
+	cogl-primitives.h 			\
+	cogl-primitives.c 			\
+	cogl-bitmap-pixbuf.c 			\
+	cogl-clip-stack.h 			\
+	cogl-clip-stack.c			\
+	cogl-feature-private.h                \
+	cogl-feature-private.c                \
+	cogl-color-private.h    		\
+	cogl-color.c				\
+	cogl-buffer-private.h 		\
+	cogl-buffer.c				\
+	cogl-pixel-buffer-private.h		\
+	cogl-pixel-buffer.c			\
+	cogl-index-buffer-private.h		\
+	cogl-index-buffer.c			\
+	cogl-attribute-buffer-private.h	\
+	cogl-attribute-buffer.c		\
+	cogl-indices-private.h		\
+	cogl-indices.c			\
+	cogl-attribute-private.h		\
+	cogl-attribute.c			\
+	cogl-primitive-private.h		\
+	cogl-primitive.c			\
+	cogl-matrix.c				\
+	cogl-vector.c				\
+	cogl-euler.c				\
+	cogl-quaternion-private.h 		\
+	cogl-quaternion.c			\
+	cogl-matrix-private.h			\
+	cogl-matrix-stack.c			\
+	cogl-matrix-stack-private.h		\
+	cogl-depth-state.c			\
+	cogl-depth-state-private.h		\
+	cogl-node.c				\
+	cogl-node-private.h			\
+	cogl-pipeline.c			\
+	cogl-pipeline-private.h		\
+	cogl-pipeline-layer.c			\
+	cogl-pipeline-layer-private.h		\
+	cogl-pipeline-state.c			\
+	cogl-pipeline-layer-state-private.h	\
+	cogl-pipeline-layer-state.c		\
+	cogl-pipeline-state-private.h		\
+	cogl-pipeline-debug.c			\
+        cogl-glsl-shader.c                    \
+        cogl-glsl-shader-private.h            \
+        cogl-glsl-shader-boilerplate.h        \
+	cogl-pipeline-snippet-private.h	\
+	cogl-pipeline-snippet.c		\
+	cogl-pipeline-cache.h			\
+	cogl-pipeline-cache.c			\
+	cogl-pipeline-hash-table.h		\
+	cogl-pipeline-hash-table.c		\
+	cogl-sampler-cache.c			\
+	cogl-sampler-cache-private.h		\
+	cogl-blend-string.c			\
+	cogl-blend-string.h			\
+	cogl-debug.c				\
+	cogl-sub-texture-private.h            \
+	cogl-texture-private.h		\
+	cogl-texture-2d-private.h             \
+	cogl-texture-2d-sliced-private.h 	\
+	cogl-texture-3d-private.h             \
+	cogl-texture-driver.h			\
+	cogl-sub-texture.c                    \
+	cogl-texture.c			\
+	cogl-texture-2d.c                     \
+	cogl-texture-2d-sliced.c		\
+	cogl-texture-3d.c                     \
+	cogl-texture-rectangle-private.h      \
+	cogl-texture-rectangle.c              \
+	cogl-rectangle-map.h                  \
+	cogl-rectangle-map.c                  \
+	cogl-atlas.h                          \
+	cogl-atlas.c                          \
+	cogl-atlas-texture-private.h          \
+	cogl-atlas-texture.c                  \
+	cogl-meta-texture.c			\
+	cogl-primitive-texture.c		\
+	cogl-blit.h				\
+	cogl-blit.c				\
+	cogl-spans.h				\
+	cogl-spans.c				\
+	cogl-journal-private.h		\
+	cogl-journal.c			\
+	cogl-frame-info-private.h		\
+	cogl-frame-info.c			\
+	cogl-framebuffer-private.h		\
+	cogl-framebuffer.c 			\
+	cogl-onscreen-private.h		\
+	cogl-onscreen.c 			\
+	cogl-output-private.h			\
+	cogl-output.c				\
+	cogl-profile.h 			\
+	cogl-profile.c 			\
+	cogl-flags.h				\
+	cogl-bitmask.h                        \
+	cogl-bitmask.c                        \
+	cogl-gtype.c                          \
+	cogl-gtype-private.h                  \
+	cogl-point-in-poly-private.h       	\
+	cogl-point-in-poly.c       		\
+	cogl-list.c				\
+	cogl-list.h				\
+	winsys/cogl-winsys-stub-private.h	\
+	winsys/cogl-winsys-stub.c		\
+	cogl-config-private.h			\
+	cogl-config.c				\
+	cogl-boxed-value.h			\
+	cogl-boxed-value.c			\
+	cogl-snippet-private.h		\
+	cogl-snippet.c			\
+	cogl-poll-private.h			\
+	cogl-poll.c				\
+	gl-prototypes/cogl-all-functions.h	\
+	gl-prototypes/cogl-gles1-functions.h	\
+	gl-prototypes/cogl-gles2-functions.h	\
+	gl-prototypes/cogl-core-functions.h	\
+	gl-prototypes/cogl-in-gles-core-functions.h	\
+	gl-prototypes/cogl-in-gles1-core-functions.h	\
+	gl-prototypes/cogl-in-gles2-core-functions.h	\
+	gl-prototypes/cogl-fixed-functions.h	\
+	gl-prototypes/cogl-glsl-functions.h	\
+	cogl-memory-stack-private.h		\
+	cogl-memory-stack.c			\
+	cogl-magazine-private.h		\
+	cogl-magazine.c			\
+	cogl-gles2-context-private.h		\
+	cogl-gles2-context.c			\
+	cogl-error-private.h			\
+	cogl-error.c				\
+	cogl-closure-list-private.h		\
+	cogl-closure-list.c			\
+	cogl-fence.c				\
+	cogl-fence-private.h			\
+	deprecated/cogl-clip-state.c			\
+	deprecated/cogl-fixed.c		    	\
+	deprecated/cogl-vertex-buffer-private.h	\
+	deprecated/cogl-vertex-buffer.c		\
+	deprecated/cogl-material-compat.c		\
+	deprecated/cogl-program.c			\
+	deprecated/cogl-program-private.h		\
+	deprecated/cogl-auto-texture.c		\
+	deprecated/cogl-shader-private.h		\
+	deprecated/cogl-shader.c			\
+	deprecated/cogl-clutter.c       		\
+	deprecated/cogl-framebuffer-deprecated.c      \
+	deprecated/cogl-texture-deprecated.c       	\
+	$(NULL)
+
+cogl_experimental_h += cogl-glib-source.h
+cogl_sources_c += cogl-glib-source.c
+
+if SUPPORT_XLIB
+cogl_deprecated_h += deprecated/cogl-clutter-xlib.h
+cogl_1_public_h += cogl-xlib-renderer.h
+
+cogl_experimental_h += \
+	winsys/cogl-texture-pixmap-x11.h \
+	cogl-xlib.h
+
+cogl_sources_c += \
+	cogl-x11-renderer-private.h \
+	cogl-xlib-renderer-private.h \
+	cogl-xlib-renderer.c \
+	cogl-xlib.c \
+	cogl-xlib-private.h \
+	winsys/cogl-texture-pixmap-x11.c \
+	winsys/cogl-texture-pixmap-x11-private.h
+endif
+if SUPPORT_GLX
+cogl_experimental_h += cogl-glx.h
+cogl_sources_c += \
+	cogl-glx-renderer-private.h \
+	cogl-glx-display-private.h \
+	winsys/cogl-winsys-glx-feature-functions.h \
+	winsys/cogl-winsys-glx-private.h \
+	winsys/cogl-winsys-glx.c
+endif
+if SUPPORT_WAYLAND_EGL_SERVER
+cogl_experimental_h += cogl-wayland-server.h
+endif
+if SUPPORT_EGL_PLATFORM_KMS
+cogl_experimental_h += \
+	cogl-kms-renderer.h \
+	cogl-kms-display.h
+cogl_sources_c += \
+	winsys/cogl-winsys-egl-kms.c \
+	winsys/cogl-winsys-egl-kms-private.h
+endif
+if SUPPORT_EGL_PLATFORM_XLIB
+cogl_sources_c += \
+	winsys/cogl-winsys-egl-x11.c \
+	winsys/cogl-winsys-egl-x11-private.h
+endif
+if SUPPORT_EGL
+cogl_experimental_h += cogl-egl.h
+cogl_nodist_experimental_h += cogl-egl-defines.h
+
+cogl_sources_c += \
+	cogl-egl-private.h \
+	winsys/cogl-winsys-egl.c \
+	winsys/cogl-winsys-egl-feature-functions.h \
+	winsys/cogl-winsys-egl-private.h
+endif
+
+# glib-mkenums rules
+glib_enum_h = cogl-enum-types.h
+glib_enum_c = cogl-enum-types.c
+glib_enum_headers = $(cogl_1_public_h)
+include $(top_srcdir)/build/autotools/Makefile.am.enums
+
+mutterlibdir = $(libdir)/mutter
+mutterlib_LTLIBRARIES = libmutter-cogl.la
+
+libmutter_cogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+if UNIT_TESTS
+libmutter_cogl_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la
+endif
+# XXX: The aim is to eventually get rid of all private API exports
+# for cogl-pango.
+libmutter_cogl_la_LDFLAGS = \
+	-no-undefined \
+	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
+	-export-dynamic \
+	-rpath $(mutterlibdir) \
+	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*"
+
+libmutter_cogl_la_SOURCES = $(cogl_sources_c)
+nodist_libmutter_cogl_la_SOURCES = $(BUILT_SOURCES)
+
+# Cogl installed headers
+cogl_headers = \
+	$(cogl_1_public_h) \
+	cogl-deprecated.h \
+	cogl-pango.h \
+	$(NULL)
+
+cogl_base_includedir = $(includedir)/mutter
+cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated
+cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h)
+
+coglincludedir = $(cogl_base_includedir)/cogl/cogl
+coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
+nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
+
+cogl_proto_includedir = $(cogl_base_includedir)/cogl/cogl/gl-prototypes
+cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
+
+EXTRA_DIST += \
+	cogl.symbols
+
+-include $(INTROSPECTION_MAKEFILE)
+
+INTROSPECTION_GIRS =
+
+if HAVE_INTROSPECTION
+Cogl-1.0.gir: libmutter-cogl.la Makefile
+
+Cogl_1_0_gir_NAMESPACE = Cogl
+Cogl_1_0_gir_VERSION = 1.0
+Cogl_1_0_gir_LIBS = libmutter-cogl.la
+if UNIT_TESTS
+Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
+endif
+Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h
+
+Cogl-2.0.gir: libmutter-cogl.la Makefile
+
+Cogl_2_0_gir_NAMESPACE = Cogl
+Cogl_2_0_gir_VERSION = 2.0
+Cogl_2_0_gir_LIBS = libmutter-cogl.la
+if UNIT_TESTS
+Cogl_2_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
+endif
+Cogl_2_0_gir_FILES = $(cogl_experimental_h) $(cogl_additional_experimental_h) cogl-enum-types.h
+
+Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
+Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
+Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
+Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
+
+Cogl_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -DCOGL_ENABLE_EXPERIMENTAL_API=1 -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -DCOGL_GIR_SCANNING
+Cogl_2_0_gir_INCLUDES = GL-1.0 GObject-2.0
+Cogl_2_0_gir_EXPORT_PACKAGES = cogl-2.0-experimental
+Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' --symbol-prefix=cogl --symbol-prefix=cogl2
+
+INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir
+
+girdir = $(mutterlibdir)
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(mutterlibdir)
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
diff --git a/cogl/cogl-atlas-texture-private.h b/cogl/cogl/cogl-atlas-texture-private.h
similarity index 100%
rename from cogl/cogl-atlas-texture-private.h
rename to cogl/cogl/cogl-atlas-texture-private.h
diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c
similarity index 100%
rename from cogl/cogl-atlas-texture.c
rename to cogl/cogl/cogl-atlas-texture.c
diff --git a/cogl/cogl-atlas-texture.h b/cogl/cogl/cogl-atlas-texture.h
similarity index 100%
rename from cogl/cogl-atlas-texture.h
rename to cogl/cogl/cogl-atlas-texture.h
diff --git a/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
similarity index 100%
rename from cogl/cogl-atlas.c
rename to cogl/cogl/cogl-atlas.c
diff --git a/cogl/cogl-atlas.h b/cogl/cogl/cogl-atlas.h
similarity index 100%
rename from cogl/cogl-atlas.h
rename to cogl/cogl/cogl-atlas.h
diff --git a/cogl/cogl-attribute-buffer-private.h b/cogl/cogl/cogl-attribute-buffer-private.h
similarity index 100%
rename from cogl/cogl-attribute-buffer-private.h
rename to cogl/cogl/cogl-attribute-buffer-private.h
diff --git a/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c
similarity index 100%
rename from cogl/cogl-attribute-buffer.c
rename to cogl/cogl/cogl-attribute-buffer.c
diff --git a/cogl/cogl-attribute-buffer.h b/cogl/cogl/cogl-attribute-buffer.h
similarity index 100%
rename from cogl/cogl-attribute-buffer.h
rename to cogl/cogl/cogl-attribute-buffer.h
diff --git a/cogl/cogl-attribute-private.h b/cogl/cogl/cogl-attribute-private.h
similarity index 100%
rename from cogl/cogl-attribute-private.h
rename to cogl/cogl/cogl-attribute-private.h
diff --git a/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
similarity index 100%
rename from cogl/cogl-attribute.c
rename to cogl/cogl/cogl-attribute.c
diff --git a/cogl/cogl-attribute.h b/cogl/cogl/cogl-attribute.h
similarity index 100%
rename from cogl/cogl-attribute.h
rename to cogl/cogl/cogl-attribute.h
diff --git a/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c
similarity index 100%
rename from cogl/cogl-bitmap-conversion.c
rename to cogl/cogl/cogl-bitmap-conversion.c
diff --git a/cogl/cogl-bitmap-packing.h b/cogl/cogl/cogl-bitmap-packing.h
similarity index 100%
rename from cogl/cogl-bitmap-packing.h
rename to cogl/cogl/cogl-bitmap-packing.h
diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c
similarity index 100%
rename from cogl/cogl-bitmap-pixbuf.c
rename to cogl/cogl/cogl-bitmap-pixbuf.c
diff --git a/cogl/cogl-bitmap-private.h b/cogl/cogl/cogl-bitmap-private.h
similarity index 100%
rename from cogl/cogl-bitmap-private.h
rename to cogl/cogl/cogl-bitmap-private.h
diff --git a/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c
similarity index 100%
rename from cogl/cogl-bitmap.c
rename to cogl/cogl/cogl-bitmap.c
diff --git a/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h
similarity index 100%
rename from cogl/cogl-bitmap.h
rename to cogl/cogl/cogl-bitmap.h
diff --git a/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c
similarity index 100%
rename from cogl/cogl-bitmask.c
rename to cogl/cogl/cogl-bitmask.c
diff --git a/cogl/cogl-bitmask.h b/cogl/cogl/cogl-bitmask.h
similarity index 100%
rename from cogl/cogl-bitmask.h
rename to cogl/cogl/cogl-bitmask.h
diff --git a/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
similarity index 100%
rename from cogl/cogl-blend-string.c
rename to cogl/cogl/cogl-blend-string.c
diff --git a/cogl/cogl-blend-string.h b/cogl/cogl/cogl-blend-string.h
similarity index 100%
rename from cogl/cogl-blend-string.h
rename to cogl/cogl/cogl-blend-string.h
diff --git a/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c
similarity index 100%
rename from cogl/cogl-blit.c
rename to cogl/cogl/cogl-blit.c
diff --git a/cogl/cogl-blit.h b/cogl/cogl/cogl-blit.h
similarity index 100%
rename from cogl/cogl-blit.h
rename to cogl/cogl/cogl-blit.h
diff --git a/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c
similarity index 100%
rename from cogl/cogl-boxed-value.c
rename to cogl/cogl/cogl-boxed-value.c
diff --git a/cogl/cogl-boxed-value.h b/cogl/cogl/cogl-boxed-value.h
similarity index 100%
rename from cogl/cogl-boxed-value.h
rename to cogl/cogl/cogl-boxed-value.h
diff --git a/cogl/cogl-buffer-private.h b/cogl/cogl/cogl-buffer-private.h
similarity index 100%
rename from cogl/cogl-buffer-private.h
rename to cogl/cogl/cogl-buffer-private.h
diff --git a/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c
similarity index 100%
rename from cogl/cogl-buffer.c
rename to cogl/cogl/cogl-buffer.c
diff --git a/cogl/cogl-buffer.h b/cogl/cogl/cogl-buffer.h
similarity index 100%
rename from cogl/cogl-buffer.h
rename to cogl/cogl/cogl-buffer.h
diff --git a/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
similarity index 100%
rename from cogl/cogl-clip-stack.c
rename to cogl/cogl/cogl-clip-stack.c
diff --git a/cogl/cogl-clip-stack.h b/cogl/cogl/cogl-clip-stack.h
similarity index 100%
rename from cogl/cogl-clip-stack.h
rename to cogl/cogl/cogl-clip-stack.h
diff --git a/cogl/cogl-closure-list-private.h b/cogl/cogl/cogl-closure-list-private.h
similarity index 100%
rename from cogl/cogl-closure-list-private.h
rename to cogl/cogl/cogl-closure-list-private.h
diff --git a/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c
similarity index 100%
rename from cogl/cogl-closure-list.c
rename to cogl/cogl/cogl-closure-list.c
diff --git a/cogl/cogl-color-private.h b/cogl/cogl/cogl-color-private.h
similarity index 100%
rename from cogl/cogl-color-private.h
rename to cogl/cogl/cogl-color-private.h
diff --git a/cogl/cogl-color.c b/cogl/cogl/cogl-color.c
similarity index 100%
rename from cogl/cogl-color.c
rename to cogl/cogl/cogl-color.c
diff --git a/cogl/cogl-color.h b/cogl/cogl/cogl-color.h
similarity index 100%
rename from cogl/cogl-color.h
rename to cogl/cogl/cogl-color.h
diff --git a/cogl/cogl-config-private.h b/cogl/cogl/cogl-config-private.h
similarity index 100%
rename from cogl/cogl-config-private.h
rename to cogl/cogl/cogl-config-private.h
diff --git a/cogl/cogl-config.c b/cogl/cogl/cogl-config.c
similarity index 100%
rename from cogl/cogl-config.c
rename to cogl/cogl/cogl-config.c
diff --git a/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h
similarity index 100%
rename from cogl/cogl-context-private.h
rename to cogl/cogl/cogl-context-private.h
diff --git a/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
similarity index 100%
rename from cogl/cogl-context.c
rename to cogl/cogl/cogl-context.c
diff --git a/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
similarity index 100%
rename from cogl/cogl-context.h
rename to cogl/cogl/cogl-context.h
diff --git a/cogl/cogl-debug-options.h b/cogl/cogl/cogl-debug-options.h
similarity index 100%
rename from cogl/cogl-debug-options.h
rename to cogl/cogl/cogl-debug-options.h
diff --git a/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c
similarity index 100%
rename from cogl/cogl-debug.c
rename to cogl/cogl/cogl-debug.c
diff --git a/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h
similarity index 100%
rename from cogl/cogl-debug.h
rename to cogl/cogl/cogl-debug.h
diff --git a/cogl/cogl-defines.h.in b/cogl/cogl/cogl-defines.h.in
similarity index 100%
rename from cogl/cogl-defines.h.in
rename to cogl/cogl/cogl-defines.h.in
diff --git a/cogl/cogl-deprecated.h b/cogl/cogl/cogl-deprecated.h
similarity index 100%
rename from cogl/cogl-deprecated.h
rename to cogl/cogl/cogl-deprecated.h
diff --git a/cogl/cogl-depth-state-private.h b/cogl/cogl/cogl-depth-state-private.h
similarity index 100%
rename from cogl/cogl-depth-state-private.h
rename to cogl/cogl/cogl-depth-state-private.h
diff --git a/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c
similarity index 100%
rename from cogl/cogl-depth-state.c
rename to cogl/cogl/cogl-depth-state.c
diff --git a/cogl/cogl-depth-state.h b/cogl/cogl/cogl-depth-state.h
similarity index 100%
rename from cogl/cogl-depth-state.h
rename to cogl/cogl/cogl-depth-state.h
diff --git a/cogl/cogl-display-private.h b/cogl/cogl/cogl-display-private.h
similarity index 100%
rename from cogl/cogl-display-private.h
rename to cogl/cogl/cogl-display-private.h
diff --git a/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
similarity index 100%
rename from cogl/cogl-display.c
rename to cogl/cogl/cogl-display.c
diff --git a/cogl/cogl-display.h b/cogl/cogl/cogl-display.h
similarity index 100%
rename from cogl/cogl-display.h
rename to cogl/cogl/cogl-display.h
diff --git a/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h
similarity index 100%
rename from cogl/cogl-driver.h
rename to cogl/cogl/cogl-driver.h
diff --git a/cogl/cogl-egl-defines.h.in b/cogl/cogl/cogl-egl-defines.h.in
similarity index 100%
rename from cogl/cogl-egl-defines.h.in
rename to cogl/cogl/cogl-egl-defines.h.in
diff --git a/cogl/cogl-egl-private.h b/cogl/cogl/cogl-egl-private.h
similarity index 100%
rename from cogl/cogl-egl-private.h
rename to cogl/cogl/cogl-egl-private.h
diff --git a/cogl/cogl-egl.h b/cogl/cogl/cogl-egl.h
similarity index 100%
rename from cogl/cogl-egl.h
rename to cogl/cogl/cogl-egl.h
diff --git a/cogl/cogl-enum-types.c.in b/cogl/cogl/cogl-enum-types.c.in
similarity index 100%
rename from cogl/cogl-enum-types.c.in
rename to cogl/cogl/cogl-enum-types.c.in
diff --git a/cogl/cogl-enum-types.h.in b/cogl/cogl/cogl-enum-types.h.in
similarity index 100%
rename from cogl/cogl-enum-types.h.in
rename to cogl/cogl/cogl-enum-types.h.in
diff --git a/cogl/cogl-error-private.h b/cogl/cogl/cogl-error-private.h
similarity index 100%
rename from cogl/cogl-error-private.h
rename to cogl/cogl/cogl-error-private.h
diff --git a/cogl/cogl-error.c b/cogl/cogl/cogl-error.c
similarity index 100%
rename from cogl/cogl-error.c
rename to cogl/cogl/cogl-error.c
diff --git a/cogl/cogl-error.h b/cogl/cogl/cogl-error.h
similarity index 100%
rename from cogl/cogl-error.h
rename to cogl/cogl/cogl-error.h
diff --git a/cogl/cogl-euler.c b/cogl/cogl/cogl-euler.c
similarity index 100%
rename from cogl/cogl-euler.c
rename to cogl/cogl/cogl-euler.c
diff --git a/cogl/cogl-euler.h b/cogl/cogl/cogl-euler.h
similarity index 100%
rename from cogl/cogl-euler.h
rename to cogl/cogl/cogl-euler.h
diff --git a/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c
similarity index 100%
rename from cogl/cogl-feature-private.c
rename to cogl/cogl/cogl-feature-private.c
diff --git a/cogl/cogl-feature-private.h b/cogl/cogl/cogl-feature-private.h
similarity index 100%
rename from cogl/cogl-feature-private.h
rename to cogl/cogl/cogl-feature-private.h
diff --git a/cogl/cogl-fence-private.h b/cogl/cogl/cogl-fence-private.h
similarity index 100%
rename from cogl/cogl-fence-private.h
rename to cogl/cogl/cogl-fence-private.h
diff --git a/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
similarity index 100%
rename from cogl/cogl-fence.c
rename to cogl/cogl/cogl-fence.c
diff --git a/cogl/cogl-fence.h b/cogl/cogl/cogl-fence.h
similarity index 100%
rename from cogl/cogl-fence.h
rename to cogl/cogl/cogl-fence.h
diff --git a/cogl/cogl-flags.h b/cogl/cogl/cogl-flags.h
similarity index 100%
rename from cogl/cogl-flags.h
rename to cogl/cogl/cogl-flags.h
diff --git a/cogl/cogl-frame-info-private.h b/cogl/cogl/cogl-frame-info-private.h
similarity index 100%
rename from cogl/cogl-frame-info-private.h
rename to cogl/cogl/cogl-frame-info-private.h
diff --git a/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c
similarity index 100%
rename from cogl/cogl-frame-info.c
rename to cogl/cogl/cogl-frame-info.c
diff --git a/cogl/cogl-frame-info.h b/cogl/cogl/cogl-frame-info.h
similarity index 100%
rename from cogl/cogl-frame-info.h
rename to cogl/cogl/cogl-frame-info.h
diff --git a/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h
similarity index 100%
rename from cogl/cogl-framebuffer-private.h
rename to cogl/cogl/cogl-framebuffer-private.h
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
similarity index 100%
rename from cogl/cogl-framebuffer.c
rename to cogl/cogl/cogl-framebuffer.c
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
similarity index 100%
rename from cogl/cogl-framebuffer.h
rename to cogl/cogl/cogl-framebuffer.h
diff --git a/cogl/cogl-gl-header.h.in b/cogl/cogl/cogl-gl-header.h.in
similarity index 100%
rename from cogl/cogl-gl-header.h.in
rename to cogl/cogl/cogl-gl-header.h.in
diff --git a/cogl/cogl-gles2-context-private.h b/cogl/cogl/cogl-gles2-context-private.h
similarity index 100%
rename from cogl/cogl-gles2-context-private.h
rename to cogl/cogl/cogl-gles2-context-private.h
diff --git a/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c
similarity index 100%
rename from cogl/cogl-gles2-context.c
rename to cogl/cogl/cogl-gles2-context.c
diff --git a/cogl/cogl-gles2-types.h b/cogl/cogl/cogl-gles2-types.h
similarity index 100%
rename from cogl/cogl-gles2-types.h
rename to cogl/cogl/cogl-gles2-types.h
diff --git a/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h
similarity index 100%
rename from cogl/cogl-gles2.h
rename to cogl/cogl/cogl-gles2.h
diff --git a/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
similarity index 100%
rename from cogl/cogl-glib-source.c
rename to cogl/cogl/cogl-glib-source.c
diff --git a/cogl/cogl-glib-source.h b/cogl/cogl/cogl-glib-source.h
similarity index 100%
rename from cogl/cogl-glib-source.h
rename to cogl/cogl/cogl-glib-source.h
diff --git a/cogl/cogl-glsl-shader-boilerplate.h b/cogl/cogl/cogl-glsl-shader-boilerplate.h
similarity index 100%
rename from cogl/cogl-glsl-shader-boilerplate.h
rename to cogl/cogl/cogl-glsl-shader-boilerplate.h
diff --git a/cogl/cogl-glsl-shader-private.h b/cogl/cogl/cogl-glsl-shader-private.h
similarity index 100%
rename from cogl/cogl-glsl-shader-private.h
rename to cogl/cogl/cogl-glsl-shader-private.h
diff --git a/cogl/cogl-glsl-shader.c b/cogl/cogl/cogl-glsl-shader.c
similarity index 100%
rename from cogl/cogl-glsl-shader.c
rename to cogl/cogl/cogl-glsl-shader.c
diff --git a/cogl/cogl-glx-display-private.h b/cogl/cogl/cogl-glx-display-private.h
similarity index 100%
rename from cogl/cogl-glx-display-private.h
rename to cogl/cogl/cogl-glx-display-private.h
diff --git a/cogl/cogl-glx-renderer-private.h b/cogl/cogl/cogl-glx-renderer-private.h
similarity index 100%
rename from cogl/cogl-glx-renderer-private.h
rename to cogl/cogl/cogl-glx-renderer-private.h
diff --git a/cogl/cogl-glx.h b/cogl/cogl/cogl-glx.h
similarity index 100%
rename from cogl/cogl-glx.h
rename to cogl/cogl/cogl-glx.h
diff --git a/cogl/cogl-gpu-info-private.h b/cogl/cogl/cogl-gpu-info-private.h
similarity index 100%
rename from cogl/cogl-gpu-info-private.h
rename to cogl/cogl/cogl-gpu-info-private.h
diff --git a/cogl/cogl-gpu-info.c b/cogl/cogl/cogl-gpu-info.c
similarity index 100%
rename from cogl/cogl-gpu-info.c
rename to cogl/cogl/cogl-gpu-info.c
diff --git a/cogl/cogl-gtype-private.h b/cogl/cogl/cogl-gtype-private.h
similarity index 100%
rename from cogl/cogl-gtype-private.h
rename to cogl/cogl/cogl-gtype-private.h
diff --git a/cogl/cogl-gtype.c b/cogl/cogl/cogl-gtype.c
similarity index 100%
rename from cogl/cogl-gtype.c
rename to cogl/cogl/cogl-gtype.c
diff --git a/cogl/cogl-i18n-private.h b/cogl/cogl/cogl-i18n-private.h
similarity index 100%
rename from cogl/cogl-i18n-private.h
rename to cogl/cogl/cogl-i18n-private.h
diff --git a/cogl/cogl-index-buffer-private.h b/cogl/cogl/cogl-index-buffer-private.h
similarity index 100%
rename from cogl/cogl-index-buffer-private.h
rename to cogl/cogl/cogl-index-buffer-private.h
diff --git a/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c
similarity index 100%
rename from cogl/cogl-index-buffer.c
rename to cogl/cogl/cogl-index-buffer.c
diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl/cogl-index-buffer.h
similarity index 100%
rename from cogl/cogl-index-buffer.h
rename to cogl/cogl/cogl-index-buffer.h
diff --git a/cogl/cogl-indices-private.h b/cogl/cogl/cogl-indices-private.h
similarity index 100%
rename from cogl/cogl-indices-private.h
rename to cogl/cogl/cogl-indices-private.h
diff --git a/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c
similarity index 100%
rename from cogl/cogl-indices.c
rename to cogl/cogl/cogl-indices.c
diff --git a/cogl/cogl-indices.h b/cogl/cogl/cogl-indices.h
similarity index 100%
rename from cogl/cogl-indices.h
rename to cogl/cogl/cogl-indices.h
diff --git a/cogl/cogl-journal-private.h b/cogl/cogl/cogl-journal-private.h
similarity index 100%
rename from cogl/cogl-journal-private.h
rename to cogl/cogl/cogl-journal-private.h
diff --git a/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
similarity index 100%
rename from cogl/cogl-journal.c
rename to cogl/cogl/cogl-journal.c
diff --git a/cogl/cogl-kms-display.h b/cogl/cogl/cogl-kms-display.h
similarity index 100%
rename from cogl/cogl-kms-display.h
rename to cogl/cogl/cogl-kms-display.h
diff --git a/cogl/cogl-kms-renderer.h b/cogl/cogl/cogl-kms-renderer.h
similarity index 100%
rename from cogl/cogl-kms-renderer.h
rename to cogl/cogl/cogl-kms-renderer.h
diff --git a/cogl/cogl-list.c b/cogl/cogl/cogl-list.c
similarity index 100%
rename from cogl/cogl-list.c
rename to cogl/cogl/cogl-list.c
diff --git a/cogl/cogl-list.h b/cogl/cogl/cogl-list.h
similarity index 100%
rename from cogl/cogl-list.h
rename to cogl/cogl/cogl-list.h
diff --git a/cogl/cogl-macros.h b/cogl/cogl/cogl-macros.h
similarity index 100%
rename from cogl/cogl-macros.h
rename to cogl/cogl/cogl-macros.h
diff --git a/cogl/cogl-magazine-private.h b/cogl/cogl/cogl-magazine-private.h
similarity index 100%
rename from cogl/cogl-magazine-private.h
rename to cogl/cogl/cogl-magazine-private.h
diff --git a/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c
similarity index 100%
rename from cogl/cogl-magazine.c
rename to cogl/cogl/cogl-magazine.c
diff --git a/cogl/cogl-matrix-private.h b/cogl/cogl/cogl-matrix-private.h
similarity index 100%
rename from cogl/cogl-matrix-private.h
rename to cogl/cogl/cogl-matrix-private.h
diff --git a/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h
similarity index 100%
rename from cogl/cogl-matrix-stack-private.h
rename to cogl/cogl/cogl-matrix-stack-private.h
diff --git a/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
similarity index 100%
rename from cogl/cogl-matrix-stack.c
rename to cogl/cogl/cogl-matrix-stack.c
diff --git a/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h
similarity index 100%
rename from cogl/cogl-matrix-stack.h
rename to cogl/cogl/cogl-matrix-stack.h
diff --git a/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c
similarity index 100%
rename from cogl/cogl-matrix.c
rename to cogl/cogl/cogl-matrix.c
diff --git a/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h
similarity index 100%
rename from cogl/cogl-matrix.h
rename to cogl/cogl/cogl-matrix.h
diff --git a/cogl/cogl-memory-stack-private.h b/cogl/cogl/cogl-memory-stack-private.h
similarity index 100%
rename from cogl/cogl-memory-stack-private.h
rename to cogl/cogl/cogl-memory-stack-private.h
diff --git a/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c
similarity index 100%
rename from cogl/cogl-memory-stack.c
rename to cogl/cogl/cogl-memory-stack.c
diff --git a/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
similarity index 100%
rename from cogl/cogl-meta-texture.c
rename to cogl/cogl/cogl-meta-texture.c
diff --git a/cogl/cogl-meta-texture.h b/cogl/cogl/cogl-meta-texture.h
similarity index 100%
rename from cogl/cogl-meta-texture.h
rename to cogl/cogl/cogl-meta-texture.h
diff --git a/cogl/cogl-node-private.h b/cogl/cogl/cogl-node-private.h
similarity index 100%
rename from cogl/cogl-node-private.h
rename to cogl/cogl/cogl-node-private.h
diff --git a/cogl/cogl-node.c b/cogl/cogl/cogl-node.c
similarity index 100%
rename from cogl/cogl-node.c
rename to cogl/cogl/cogl-node.c
diff --git a/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h
similarity index 100%
rename from cogl/cogl-object-private.h
rename to cogl/cogl/cogl-object-private.h
diff --git a/cogl/cogl-object.c b/cogl/cogl/cogl-object.c
similarity index 100%
rename from cogl/cogl-object.c
rename to cogl/cogl/cogl-object.c
diff --git a/cogl/cogl-object.h b/cogl/cogl/cogl-object.h
similarity index 100%
rename from cogl/cogl-object.h
rename to cogl/cogl/cogl-object.h
diff --git a/cogl/cogl-offscreen.h b/cogl/cogl/cogl-offscreen.h
similarity index 100%
rename from cogl/cogl-offscreen.h
rename to cogl/cogl/cogl-offscreen.h
diff --git a/cogl/cogl-onscreen-private.h b/cogl/cogl/cogl-onscreen-private.h
similarity index 100%
rename from cogl/cogl-onscreen-private.h
rename to cogl/cogl/cogl-onscreen-private.h
diff --git a/cogl/cogl-onscreen-template-private.h b/cogl/cogl/cogl-onscreen-template-private.h
similarity index 100%
rename from cogl/cogl-onscreen-template-private.h
rename to cogl/cogl/cogl-onscreen-template-private.h
diff --git a/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c
similarity index 100%
rename from cogl/cogl-onscreen-template.c
rename to cogl/cogl/cogl-onscreen-template.c
diff --git a/cogl/cogl-onscreen-template.h b/cogl/cogl/cogl-onscreen-template.h
similarity index 100%
rename from cogl/cogl-onscreen-template.h
rename to cogl/cogl/cogl-onscreen-template.h
diff --git a/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
similarity index 100%
rename from cogl/cogl-onscreen.c
rename to cogl/cogl/cogl-onscreen.c
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
similarity index 100%
rename from cogl/cogl-onscreen.h
rename to cogl/cogl/cogl-onscreen.h
diff --git a/cogl/cogl-output-private.h b/cogl/cogl/cogl-output-private.h
similarity index 100%
rename from cogl/cogl-output-private.h
rename to cogl/cogl/cogl-output-private.h
diff --git a/cogl/cogl-output.c b/cogl/cogl/cogl-output.c
similarity index 100%
rename from cogl/cogl-output.c
rename to cogl/cogl/cogl-output.c
diff --git a/cogl/cogl-output.h b/cogl/cogl/cogl-output.h
similarity index 100%
rename from cogl/cogl-output.h
rename to cogl/cogl/cogl-output.h
diff --git a/cogl/cogl-pango.h b/cogl/cogl/cogl-pango.h
similarity index 100%
rename from cogl/cogl-pango.h
rename to cogl/cogl/cogl-pango.h
diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c
similarity index 100%
rename from cogl/cogl-pipeline-cache.c
rename to cogl/cogl/cogl-pipeline-cache.c
diff --git a/cogl/cogl-pipeline-cache.h b/cogl/cogl/cogl-pipeline-cache.h
similarity index 100%
rename from cogl/cogl-pipeline-cache.h
rename to cogl/cogl/cogl-pipeline-cache.h
diff --git a/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c
similarity index 100%
rename from cogl/cogl-pipeline-debug.c
rename to cogl/cogl/cogl-pipeline-debug.c
diff --git a/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c
similarity index 100%
rename from cogl/cogl-pipeline-hash-table.c
rename to cogl/cogl/cogl-pipeline-hash-table.c
diff --git a/cogl/cogl-pipeline-hash-table.h b/cogl/cogl/cogl-pipeline-hash-table.h
similarity index 100%
rename from cogl/cogl-pipeline-hash-table.h
rename to cogl/cogl/cogl-pipeline-hash-table.h
diff --git a/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h
similarity index 100%
rename from cogl/cogl-pipeline-layer-private.h
rename to cogl/cogl/cogl-pipeline-layer-private.h
diff --git a/cogl/cogl-pipeline-layer-state-private.h b/cogl/cogl/cogl-pipeline-layer-state-private.h
similarity index 100%
rename from cogl/cogl-pipeline-layer-state-private.h
rename to cogl/cogl/cogl-pipeline-layer-state-private.h
diff --git a/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
similarity index 100%
rename from cogl/cogl-pipeline-layer-state.c
rename to cogl/cogl/cogl-pipeline-layer-state.c
diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
similarity index 100%
rename from cogl/cogl-pipeline-layer-state.h
rename to cogl/cogl/cogl-pipeline-layer-state.h
diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c
similarity index 100%
rename from cogl/cogl-pipeline-layer.c
rename to cogl/cogl/cogl-pipeline-layer.c
diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h
similarity index 100%
rename from cogl/cogl-pipeline-private.h
rename to cogl/cogl/cogl-pipeline-private.h
diff --git a/cogl/cogl-pipeline-snippet-private.h b/cogl/cogl/cogl-pipeline-snippet-private.h
similarity index 100%
rename from cogl/cogl-pipeline-snippet-private.h
rename to cogl/cogl/cogl-pipeline-snippet-private.h
diff --git a/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c
similarity index 100%
rename from cogl/cogl-pipeline-snippet.c
rename to cogl/cogl/cogl-pipeline-snippet.c
diff --git a/cogl/cogl-pipeline-state-private.h b/cogl/cogl/cogl-pipeline-state-private.h
similarity index 100%
rename from cogl/cogl-pipeline-state-private.h
rename to cogl/cogl/cogl-pipeline-state-private.h
diff --git a/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c
similarity index 100%
rename from cogl/cogl-pipeline-state.c
rename to cogl/cogl/cogl-pipeline-state.c
diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
similarity index 100%
rename from cogl/cogl-pipeline-state.h
rename to cogl/cogl/cogl-pipeline-state.h
diff --git a/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
similarity index 100%
rename from cogl/cogl-pipeline.c
rename to cogl/cogl/cogl-pipeline.c
diff --git a/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
similarity index 100%
rename from cogl/cogl-pipeline.h
rename to cogl/cogl/cogl-pipeline.h
diff --git a/cogl/cogl-pixel-buffer-private.h b/cogl/cogl/cogl-pixel-buffer-private.h
similarity index 100%
rename from cogl/cogl-pixel-buffer-private.h
rename to cogl/cogl/cogl-pixel-buffer-private.h
diff --git a/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c
similarity index 100%
rename from cogl/cogl-pixel-buffer.c
rename to cogl/cogl/cogl-pixel-buffer.c
diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h
similarity index 100%
rename from cogl/cogl-pixel-buffer.h
rename to cogl/cogl/cogl-pixel-buffer.h
diff --git a/cogl/cogl-point-in-poly-private.h b/cogl/cogl/cogl-point-in-poly-private.h
similarity index 100%
rename from cogl/cogl-point-in-poly-private.h
rename to cogl/cogl/cogl-point-in-poly-private.h
diff --git a/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c
similarity index 100%
rename from cogl/cogl-point-in-poly.c
rename to cogl/cogl/cogl-point-in-poly.c
diff --git a/cogl/cogl-poll-private.h b/cogl/cogl/cogl-poll-private.h
similarity index 100%
rename from cogl/cogl-poll-private.h
rename to cogl/cogl/cogl-poll-private.h
diff --git a/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c
similarity index 100%
rename from cogl/cogl-poll.c
rename to cogl/cogl/cogl-poll.c
diff --git a/cogl/cogl-poll.h b/cogl/cogl/cogl-poll.h
similarity index 100%
rename from cogl/cogl-poll.h
rename to cogl/cogl/cogl-poll.h
diff --git a/cogl/cogl-primitive-private.h b/cogl/cogl/cogl-primitive-private.h
similarity index 100%
rename from cogl/cogl-primitive-private.h
rename to cogl/cogl/cogl-primitive-private.h
diff --git a/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c
similarity index 100%
rename from cogl/cogl-primitive-texture.c
rename to cogl/cogl/cogl-primitive-texture.c
diff --git a/cogl/cogl-primitive-texture.h b/cogl/cogl/cogl-primitive-texture.h
similarity index 100%
rename from cogl/cogl-primitive-texture.h
rename to cogl/cogl/cogl-primitive-texture.h
diff --git a/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c
similarity index 100%
rename from cogl/cogl-primitive.c
rename to cogl/cogl/cogl-primitive.c
diff --git a/cogl/cogl-primitive.h b/cogl/cogl/cogl-primitive.h
similarity index 100%
rename from cogl/cogl-primitive.h
rename to cogl/cogl/cogl-primitive.h
diff --git a/cogl/cogl-primitives-private.h b/cogl/cogl/cogl-primitives-private.h
similarity index 100%
rename from cogl/cogl-primitives-private.h
rename to cogl/cogl/cogl-primitives-private.h
diff --git a/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
similarity index 100%
rename from cogl/cogl-primitives.c
rename to cogl/cogl/cogl-primitives.c
diff --git a/cogl/cogl-primitives.h b/cogl/cogl/cogl-primitives.h
similarity index 100%
rename from cogl/cogl-primitives.h
rename to cogl/cogl/cogl-primitives.h
diff --git a/cogl/cogl-private.h b/cogl/cogl/cogl-private.h
similarity index 100%
rename from cogl/cogl-private.h
rename to cogl/cogl/cogl-private.h
diff --git a/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c
similarity index 100%
rename from cogl/cogl-profile.c
rename to cogl/cogl/cogl-profile.c
diff --git a/cogl/cogl-profile.h b/cogl/cogl/cogl-profile.h
similarity index 100%
rename from cogl/cogl-profile.h
rename to cogl/cogl/cogl-profile.h
diff --git a/cogl/cogl-quaternion-private.h b/cogl/cogl/cogl-quaternion-private.h
similarity index 100%
rename from cogl/cogl-quaternion-private.h
rename to cogl/cogl/cogl-quaternion-private.h
diff --git a/cogl/cogl-quaternion.c b/cogl/cogl/cogl-quaternion.c
similarity index 100%
rename from cogl/cogl-quaternion.c
rename to cogl/cogl/cogl-quaternion.c
diff --git a/cogl/cogl-quaternion.h b/cogl/cogl/cogl-quaternion.h
similarity index 100%
rename from cogl/cogl-quaternion.h
rename to cogl/cogl/cogl-quaternion.h
diff --git a/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c
similarity index 100%
rename from cogl/cogl-rectangle-map.c
rename to cogl/cogl/cogl-rectangle-map.c
diff --git a/cogl/cogl-rectangle-map.h b/cogl/cogl/cogl-rectangle-map.h
similarity index 100%
rename from cogl/cogl-rectangle-map.h
rename to cogl/cogl/cogl-rectangle-map.h
diff --git a/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
similarity index 100%
rename from cogl/cogl-renderer-private.h
rename to cogl/cogl/cogl-renderer-private.h
diff --git a/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
similarity index 100%
rename from cogl/cogl-renderer.c
rename to cogl/cogl/cogl-renderer.c
diff --git a/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h
similarity index 100%
rename from cogl/cogl-renderer.h
rename to cogl/cogl/cogl-renderer.h
diff --git a/cogl/cogl-sampler-cache-private.h b/cogl/cogl/cogl-sampler-cache-private.h
similarity index 100%
rename from cogl/cogl-sampler-cache-private.h
rename to cogl/cogl/cogl-sampler-cache-private.h
diff --git a/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c
similarity index 100%
rename from cogl/cogl-sampler-cache.c
rename to cogl/cogl/cogl-sampler-cache.c
diff --git a/cogl/cogl-snippet-private.h b/cogl/cogl/cogl-snippet-private.h
similarity index 100%
rename from cogl/cogl-snippet-private.h
rename to cogl/cogl/cogl-snippet-private.h
diff --git a/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c
similarity index 100%
rename from cogl/cogl-snippet.c
rename to cogl/cogl/cogl-snippet.c
diff --git a/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h
similarity index 100%
rename from cogl/cogl-snippet.h
rename to cogl/cogl/cogl-snippet.h
diff --git a/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c
similarity index 100%
rename from cogl/cogl-spans.c
rename to cogl/cogl/cogl-spans.c
diff --git a/cogl/cogl-spans.h b/cogl/cogl/cogl-spans.h
similarity index 100%
rename from cogl/cogl-spans.h
rename to cogl/cogl/cogl-spans.h
diff --git a/cogl/cogl-sub-texture-private.h b/cogl/cogl/cogl-sub-texture-private.h
similarity index 100%
rename from cogl/cogl-sub-texture-private.h
rename to cogl/cogl/cogl-sub-texture-private.h
diff --git a/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c
similarity index 100%
rename from cogl/cogl-sub-texture.c
rename to cogl/cogl/cogl-sub-texture.c
diff --git a/cogl/cogl-sub-texture.h b/cogl/cogl/cogl-sub-texture.h
similarity index 100%
rename from cogl/cogl-sub-texture.h
rename to cogl/cogl/cogl-sub-texture.h
diff --git a/cogl/cogl-swap-chain-private.h b/cogl/cogl/cogl-swap-chain-private.h
similarity index 100%
rename from cogl/cogl-swap-chain-private.h
rename to cogl/cogl/cogl-swap-chain-private.h
diff --git a/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c
similarity index 100%
rename from cogl/cogl-swap-chain.c
rename to cogl/cogl/cogl-swap-chain.c
diff --git a/cogl/cogl-swap-chain.h b/cogl/cogl/cogl-swap-chain.h
similarity index 100%
rename from cogl/cogl-swap-chain.h
rename to cogl/cogl/cogl-swap-chain.h
diff --git a/cogl/cogl-texture-2d-gl.h b/cogl/cogl/cogl-texture-2d-gl.h
similarity index 100%
rename from cogl/cogl-texture-2d-gl.h
rename to cogl/cogl/cogl-texture-2d-gl.h
diff --git a/cogl/cogl-texture-2d-private.h b/cogl/cogl/cogl-texture-2d-private.h
similarity index 100%
rename from cogl/cogl-texture-2d-private.h
rename to cogl/cogl/cogl-texture-2d-private.h
diff --git a/cogl/cogl-texture-2d-sliced-private.h b/cogl/cogl/cogl-texture-2d-sliced-private.h
similarity index 100%
rename from cogl/cogl-texture-2d-sliced-private.h
rename to cogl/cogl/cogl-texture-2d-sliced-private.h
diff --git a/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
similarity index 100%
rename from cogl/cogl-texture-2d-sliced.c
rename to cogl/cogl/cogl-texture-2d-sliced.c
diff --git a/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
similarity index 100%
rename from cogl/cogl-texture-2d-sliced.h
rename to cogl/cogl/cogl-texture-2d-sliced.h
diff --git a/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
similarity index 100%
rename from cogl/cogl-texture-2d.c
rename to cogl/cogl/cogl-texture-2d.c
diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
similarity index 100%
rename from cogl/cogl-texture-2d.h
rename to cogl/cogl/cogl-texture-2d.h
diff --git a/cogl/cogl-texture-3d-private.h b/cogl/cogl/cogl-texture-3d-private.h
similarity index 100%
rename from cogl/cogl-texture-3d-private.h
rename to cogl/cogl/cogl-texture-3d-private.h
diff --git a/cogl/cogl-texture-3d.c b/cogl/cogl/cogl-texture-3d.c
similarity index 100%
rename from cogl/cogl-texture-3d.c
rename to cogl/cogl/cogl-texture-3d.c
diff --git a/cogl/cogl-texture-3d.h b/cogl/cogl/cogl-texture-3d.h
similarity index 100%
rename from cogl/cogl-texture-3d.h
rename to cogl/cogl/cogl-texture-3d.h
diff --git a/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h
similarity index 100%
rename from cogl/cogl-texture-driver.h
rename to cogl/cogl/cogl-texture-driver.h
diff --git a/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h
similarity index 100%
rename from cogl/cogl-texture-private.h
rename to cogl/cogl/cogl-texture-private.h
diff --git a/cogl/cogl-texture-rectangle-private.h b/cogl/cogl/cogl-texture-rectangle-private.h
similarity index 100%
rename from cogl/cogl-texture-rectangle-private.h
rename to cogl/cogl/cogl-texture-rectangle-private.h
diff --git a/cogl/cogl-texture-rectangle.c b/cogl/cogl/cogl-texture-rectangle.c
similarity index 100%
rename from cogl/cogl-texture-rectangle.c
rename to cogl/cogl/cogl-texture-rectangle.c
diff --git a/cogl/cogl-texture-rectangle.h b/cogl/cogl/cogl-texture-rectangle.h
similarity index 100%
rename from cogl/cogl-texture-rectangle.h
rename to cogl/cogl/cogl-texture-rectangle.h
diff --git a/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c
similarity index 100%
rename from cogl/cogl-texture.c
rename to cogl/cogl/cogl-texture.c
diff --git a/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
similarity index 100%
rename from cogl/cogl-texture.h
rename to cogl/cogl/cogl-texture.h
diff --git a/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
similarity index 100%
rename from cogl/cogl-types.h
rename to cogl/cogl/cogl-types.h
diff --git a/cogl/cogl-util.c b/cogl/cogl/cogl-util.c
similarity index 100%
rename from cogl/cogl-util.c
rename to cogl/cogl/cogl-util.c
diff --git a/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
similarity index 100%
rename from cogl/cogl-util.h
rename to cogl/cogl/cogl-util.h
diff --git a/cogl/cogl-vector.c b/cogl/cogl/cogl-vector.c
similarity index 100%
rename from cogl/cogl-vector.c
rename to cogl/cogl/cogl-vector.c
diff --git a/cogl/cogl-vector.h b/cogl/cogl/cogl-vector.h
similarity index 100%
rename from cogl/cogl-vector.h
rename to cogl/cogl/cogl-vector.h
diff --git a/cogl/cogl-version.h b/cogl/cogl/cogl-version.h
similarity index 100%
rename from cogl/cogl-version.h
rename to cogl/cogl/cogl-version.h
diff --git a/cogl/cogl-wayland-server.h b/cogl/cogl/cogl-wayland-server.h
similarity index 100%
rename from cogl/cogl-wayland-server.h
rename to cogl/cogl/cogl-wayland-server.h
diff --git a/cogl/cogl-x11-renderer-private.h b/cogl/cogl/cogl-x11-renderer-private.h
similarity index 100%
rename from cogl/cogl-x11-renderer-private.h
rename to cogl/cogl/cogl-x11-renderer-private.h
diff --git a/cogl/cogl-xlib-private.h b/cogl/cogl/cogl-xlib-private.h
similarity index 100%
rename from cogl/cogl-xlib-private.h
rename to cogl/cogl/cogl-xlib-private.h
diff --git a/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h
similarity index 100%
rename from cogl/cogl-xlib-renderer-private.h
rename to cogl/cogl/cogl-xlib-renderer-private.h
diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
similarity index 100%
rename from cogl/cogl-xlib-renderer.c
rename to cogl/cogl/cogl-xlib-renderer.c
diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
similarity index 100%
rename from cogl/cogl-xlib-renderer.h
rename to cogl/cogl/cogl-xlib-renderer.h
diff --git a/cogl/cogl-xlib.c b/cogl/cogl/cogl-xlib.c
similarity index 100%
rename from cogl/cogl-xlib.c
rename to cogl/cogl/cogl-xlib.c
diff --git a/cogl/cogl-xlib.h b/cogl/cogl/cogl-xlib.h
similarity index 100%
rename from cogl/cogl-xlib.h
rename to cogl/cogl/cogl-xlib.h
diff --git a/cogl/cogl.c b/cogl/cogl/cogl.c
similarity index 100%
rename from cogl/cogl.c
rename to cogl/cogl/cogl.c
diff --git a/cogl/cogl.h b/cogl/cogl/cogl.h
similarity index 100%
rename from cogl/cogl.h
rename to cogl/cogl/cogl.h
diff --git a/cogl/cogl.symbols b/cogl/cogl/cogl.symbols
similarity index 100%
rename from cogl/cogl.symbols
rename to cogl/cogl/cogl.symbols
diff --git a/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h
similarity index 100%
rename from cogl/cogl1-context.h
rename to cogl/cogl/cogl1-context.h
diff --git a/cogl/cogl2-experimental.h b/cogl/cogl/cogl2-experimental.h
similarity index 100%
rename from cogl/cogl2-experimental.h
rename to cogl/cogl/cogl2-experimental.h
diff --git a/cogl/deprecated/cogl-auto-texture.c b/cogl/cogl/deprecated/cogl-auto-texture.c
similarity index 100%
rename from cogl/deprecated/cogl-auto-texture.c
rename to cogl/cogl/deprecated/cogl-auto-texture.c
diff --git a/cogl/deprecated/cogl-auto-texture.h b/cogl/cogl/deprecated/cogl-auto-texture.h
similarity index 100%
rename from cogl/deprecated/cogl-auto-texture.h
rename to cogl/cogl/deprecated/cogl-auto-texture.h
diff --git a/cogl/deprecated/cogl-clip-state.c b/cogl/cogl/deprecated/cogl-clip-state.c
similarity index 100%
rename from cogl/deprecated/cogl-clip-state.c
rename to cogl/cogl/deprecated/cogl-clip-state.c
diff --git a/cogl/deprecated/cogl-clip-state.h b/cogl/cogl/deprecated/cogl-clip-state.h
similarity index 100%
rename from cogl/deprecated/cogl-clip-state.h
rename to cogl/cogl/deprecated/cogl-clip-state.h
diff --git a/cogl/deprecated/cogl-clutter-xlib.h b/cogl/cogl/deprecated/cogl-clutter-xlib.h
similarity index 100%
rename from cogl/deprecated/cogl-clutter-xlib.h
rename to cogl/cogl/deprecated/cogl-clutter-xlib.h
diff --git a/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c
similarity index 100%
rename from cogl/deprecated/cogl-clutter.c
rename to cogl/cogl/deprecated/cogl-clutter.c
diff --git a/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h
similarity index 100%
rename from cogl/deprecated/cogl-clutter.h
rename to cogl/cogl/deprecated/cogl-clutter.h
diff --git a/cogl/deprecated/cogl-fixed.c b/cogl/cogl/deprecated/cogl-fixed.c
similarity index 100%
rename from cogl/deprecated/cogl-fixed.c
rename to cogl/cogl/deprecated/cogl-fixed.c
diff --git a/cogl/deprecated/cogl-fixed.h b/cogl/cogl/deprecated/cogl-fixed.h
similarity index 100%
rename from cogl/deprecated/cogl-fixed.h
rename to cogl/cogl/deprecated/cogl-fixed.h
diff --git a/cogl/deprecated/cogl-framebuffer-deprecated.c b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
similarity index 100%
rename from cogl/deprecated/cogl-framebuffer-deprecated.c
rename to cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
diff --git a/cogl/deprecated/cogl-framebuffer-deprecated.h b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
similarity index 100%
rename from cogl/deprecated/cogl-framebuffer-deprecated.h
rename to cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
diff --git a/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
similarity index 100%
rename from cogl/deprecated/cogl-material-compat.c
rename to cogl/cogl/deprecated/cogl-material-compat.c
diff --git a/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
similarity index 100%
rename from cogl/deprecated/cogl-material-compat.h
rename to cogl/cogl/deprecated/cogl-material-compat.h
diff --git a/cogl/deprecated/cogl-program-private.h b/cogl/cogl/deprecated/cogl-program-private.h
similarity index 100%
rename from cogl/deprecated/cogl-program-private.h
rename to cogl/cogl/deprecated/cogl-program-private.h
diff --git a/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
similarity index 100%
rename from cogl/deprecated/cogl-program.c
rename to cogl/cogl/deprecated/cogl-program.c
diff --git a/cogl/deprecated/cogl-shader-private.h b/cogl/cogl/deprecated/cogl-shader-private.h
similarity index 100%
rename from cogl/deprecated/cogl-shader-private.h
rename to cogl/cogl/deprecated/cogl-shader-private.h
diff --git a/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
similarity index 100%
rename from cogl/deprecated/cogl-shader.c
rename to cogl/cogl/deprecated/cogl-shader.c
diff --git a/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
similarity index 100%
rename from cogl/deprecated/cogl-shader.h
rename to cogl/cogl/deprecated/cogl-shader.h
diff --git a/cogl/deprecated/cogl-texture-deprecated.c b/cogl/cogl/deprecated/cogl-texture-deprecated.c
similarity index 100%
rename from cogl/deprecated/cogl-texture-deprecated.c
rename to cogl/cogl/deprecated/cogl-texture-deprecated.c
diff --git a/cogl/deprecated/cogl-texture-deprecated.h b/cogl/cogl/deprecated/cogl-texture-deprecated.h
similarity index 100%
rename from cogl/deprecated/cogl-texture-deprecated.h
rename to cogl/cogl/deprecated/cogl-texture-deprecated.h
diff --git a/cogl/deprecated/cogl-type-casts.h b/cogl/cogl/deprecated/cogl-type-casts.h
similarity index 100%
rename from cogl/deprecated/cogl-type-casts.h
rename to cogl/cogl/deprecated/cogl-type-casts.h
diff --git a/cogl/deprecated/cogl-vertex-buffer-private.h b/cogl/cogl/deprecated/cogl-vertex-buffer-private.h
similarity index 100%
rename from cogl/deprecated/cogl-vertex-buffer-private.h
rename to cogl/cogl/deprecated/cogl-vertex-buffer-private.h
diff --git a/cogl/deprecated/cogl-vertex-buffer.c b/cogl/cogl/deprecated/cogl-vertex-buffer.c
similarity index 100%
rename from cogl/deprecated/cogl-vertex-buffer.c
rename to cogl/cogl/deprecated/cogl-vertex-buffer.c
diff --git a/cogl/deprecated/cogl-vertex-buffer.h b/cogl/cogl/deprecated/cogl-vertex-buffer.h
similarity index 100%
rename from cogl/deprecated/cogl-vertex-buffer.h
rename to cogl/cogl/deprecated/cogl-vertex-buffer.h
diff --git a/cogl/driver/gl/cogl-attribute-gl-private.h b/cogl/cogl/driver/gl/cogl-attribute-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-attribute-gl-private.h
rename to cogl/cogl/driver/gl/cogl-attribute-gl-private.h
diff --git a/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-attribute-gl.c
rename to cogl/cogl/driver/gl/cogl-attribute-gl.c
diff --git a/cogl/driver/gl/cogl-buffer-gl-private.h b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-buffer-gl-private.h
rename to cogl/cogl/driver/gl/cogl-buffer-gl-private.h
diff --git a/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-buffer-gl.c
rename to cogl/cogl/driver/gl/cogl-buffer-gl.c
diff --git a/cogl/driver/gl/cogl-clip-stack-gl-private.h b/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-clip-stack-gl-private.h
rename to cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h
diff --git a/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-clip-stack-gl.c
rename to cogl/cogl/driver/gl/cogl-clip-stack-gl.c
diff --git a/cogl/driver/gl/cogl-framebuffer-gl-private.h b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-framebuffer-gl-private.h
rename to cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-framebuffer-gl.c
rename to cogl/cogl/driver/gl/cogl-framebuffer-gl.c
diff --git a/cogl/driver/gl/cogl-pipeline-fragend-fixed-private.h b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-fragend-fixed-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-fragend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-fragend-fixed.c
rename to cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
diff --git a/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-fragend-glsl.c
rename to cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
diff --git a/cogl/driver/gl/cogl-pipeline-opengl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-opengl-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-opengl.c
rename to cogl/cogl/driver/gl/cogl-pipeline-opengl.c
diff --git a/cogl/driver/gl/cogl-pipeline-progend-fixed-private.h b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-progend-fixed-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-progend-fixed-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-progend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-progend-fixed.c
rename to cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
diff --git a/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-progend-glsl.c
rename to cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
diff --git a/cogl/driver/gl/cogl-pipeline-vertend-fixed-private.h b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-vertend-fixed-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-vertend-fixed.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-vertend-fixed.c
rename to cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
diff --git a/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
diff --git a/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
similarity index 100%
rename from cogl/driver/gl/cogl-pipeline-vertend-glsl.c
rename to cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
diff --git a/cogl/driver/gl/cogl-texture-2d-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-texture-2d-gl-private.h
rename to cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
diff --git a/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-texture-2d-gl.c
rename to cogl/cogl/driver/gl/cogl-texture-2d-gl.c
diff --git a/cogl/driver/gl/cogl-texture-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-texture-gl-private.h
rename to cogl/cogl/driver/gl/cogl-texture-gl-private.h
diff --git a/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-texture-gl.c
rename to cogl/cogl/driver/gl/cogl-texture-gl.c
diff --git a/cogl/driver/gl/cogl-util-gl-private.h b/cogl/cogl/driver/gl/cogl-util-gl-private.h
similarity index 100%
rename from cogl/driver/gl/cogl-util-gl-private.h
rename to cogl/cogl/driver/gl/cogl-util-gl-private.h
diff --git a/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
similarity index 100%
rename from cogl/driver/gl/cogl-util-gl.c
rename to cogl/cogl/driver/gl/cogl-util-gl.c
diff --git a/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
similarity index 100%
rename from cogl/driver/gl/gl/cogl-driver-gl.c
rename to cogl/cogl/driver/gl/gl/cogl-driver-gl.c
diff --git a/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h
similarity index 100%
rename from cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h
rename to cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp-private.h
diff --git a/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
similarity index 100%
rename from cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
rename to cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
diff --git a/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h
similarity index 100%
rename from cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h
rename to cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp-private.h
diff --git a/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
similarity index 100%
rename from cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
rename to cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
diff --git a/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
similarity index 100%
rename from cogl/driver/gl/gl/cogl-texture-driver-gl.c
rename to cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
diff --git a/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
similarity index 100%
rename from cogl/driver/gl/gles/cogl-driver-gles.c
rename to cogl/cogl/driver/gl/gles/cogl-driver-gles.c
diff --git a/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
similarity index 100%
rename from cogl/driver/gl/gles/cogl-texture-driver-gles.c
rename to cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
diff --git a/cogl/driver/nop/cogl-attribute-nop-private.h b/cogl/cogl/driver/nop/cogl-attribute-nop-private.h
similarity index 100%
rename from cogl/driver/nop/cogl-attribute-nop-private.h
rename to cogl/cogl/driver/nop/cogl-attribute-nop-private.h
diff --git a/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c
similarity index 100%
rename from cogl/driver/nop/cogl-attribute-nop.c
rename to cogl/cogl/driver/nop/cogl-attribute-nop.c
diff --git a/cogl/driver/nop/cogl-clip-stack-nop-private.h b/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h
similarity index 100%
rename from cogl/driver/nop/cogl-clip-stack-nop-private.h
rename to cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h
diff --git a/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
similarity index 100%
rename from cogl/driver/nop/cogl-clip-stack-nop.c
rename to cogl/cogl/driver/nop/cogl-clip-stack-nop.c
diff --git a/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
similarity index 100%
rename from cogl/driver/nop/cogl-driver-nop.c
rename to cogl/cogl/driver/nop/cogl-driver-nop.c
diff --git a/cogl/driver/nop/cogl-framebuffer-nop-private.h b/cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
similarity index 100%
rename from cogl/driver/nop/cogl-framebuffer-nop-private.h
rename to cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
diff --git a/cogl/driver/nop/cogl-framebuffer-nop.c b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
similarity index 100%
rename from cogl/driver/nop/cogl-framebuffer-nop.c
rename to cogl/cogl/driver/nop/cogl-framebuffer-nop.c
diff --git a/cogl/driver/nop/cogl-texture-2d-nop-private.h b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
similarity index 100%
rename from cogl/driver/nop/cogl-texture-2d-nop-private.h
rename to cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
diff --git a/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
similarity index 100%
rename from cogl/driver/nop/cogl-texture-2d-nop.c
rename to cogl/cogl/driver/nop/cogl-texture-2d-nop.c
diff --git a/cogl/gl-prototypes/cogl-all-functions.h b/cogl/cogl/gl-prototypes/cogl-all-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-all-functions.h
rename to cogl/cogl/gl-prototypes/cogl-all-functions.h
diff --git a/cogl/gl-prototypes/cogl-core-functions.h b/cogl/cogl/gl-prototypes/cogl-core-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-core-functions.h
rename to cogl/cogl/gl-prototypes/cogl-core-functions.h
diff --git a/cogl/gl-prototypes/cogl-fixed-functions.h b/cogl/cogl/gl-prototypes/cogl-fixed-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-fixed-functions.h
rename to cogl/cogl/gl-prototypes/cogl-fixed-functions.h
diff --git a/cogl/gl-prototypes/cogl-gles1-functions.h b/cogl/cogl/gl-prototypes/cogl-gles1-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-gles1-functions.h
rename to cogl/cogl/gl-prototypes/cogl-gles1-functions.h
diff --git a/cogl/gl-prototypes/cogl-gles2-functions.h b/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-gles2-functions.h
rename to cogl/cogl/gl-prototypes/cogl-gles2-functions.h
diff --git a/cogl/gl-prototypes/cogl-glsl-functions.h b/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-glsl-functions.h
rename to cogl/cogl/gl-prototypes/cogl-glsl-functions.h
diff --git a/cogl/gl-prototypes/cogl-in-gles-core-functions.h b/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-in-gles-core-functions.h
rename to cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
diff --git a/cogl/gl-prototypes/cogl-in-gles1-core-functions.h b/cogl/cogl/gl-prototypes/cogl-in-gles1-core-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-in-gles1-core-functions.h
rename to cogl/cogl/gl-prototypes/cogl-in-gles1-core-functions.h
diff --git a/cogl/gl-prototypes/cogl-in-gles2-core-functions.h b/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
similarity index 100%
rename from cogl/gl-prototypes/cogl-in-gles2-core-functions.h
rename to cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
diff --git a/cogl/mutter-cogl-1.0.pc.in b/cogl/cogl/mutter-cogl-1.0.pc.in
similarity index 100%
rename from cogl/mutter-cogl-1.0.pc.in
rename to cogl/cogl/mutter-cogl-1.0.pc.in
diff --git a/cogl/winsys/cogl-texture-pixmap-x11-private.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
similarity index 100%
rename from cogl/winsys/cogl-texture-pixmap-x11-private.h
rename to cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
similarity index 100%
rename from cogl/winsys/cogl-texture-pixmap-x11.c
rename to cogl/cogl/winsys/cogl-texture-pixmap-x11.c
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
similarity index 100%
rename from cogl/winsys/cogl-texture-pixmap-x11.h
rename to cogl/cogl/winsys/cogl-texture-pixmap-x11.h
diff --git a/cogl/winsys/cogl-winsys-egl-feature-functions.h b/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-feature-functions.h
rename to cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
diff --git a/cogl/winsys/cogl-winsys-egl-kms-private.h b/cogl/cogl/winsys/cogl-winsys-egl-kms-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-kms-private.h
rename to cogl/cogl/winsys/cogl-winsys-egl-kms-private.h
diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/cogl/winsys/cogl-winsys-egl-kms.c
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-kms.c
rename to cogl/cogl/winsys/cogl-winsys-egl-kms.c
diff --git a/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-private.h
rename to cogl/cogl/winsys/cogl-winsys-egl-private.h
diff --git a/cogl/winsys/cogl-winsys-egl-x11-private.h b/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-x11-private.h
rename to cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
diff --git a/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-x11.c
rename to cogl/cogl/winsys/cogl-winsys-egl-x11.c
diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl.c
rename to cogl/cogl/winsys/cogl-winsys-egl.c
diff --git a/cogl/winsys/cogl-winsys-glx-feature-functions.h b/cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-glx-feature-functions.h
rename to cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h
diff --git a/cogl/winsys/cogl-winsys-glx-private.h b/cogl/cogl/winsys/cogl-winsys-glx-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-glx-private.h
rename to cogl/cogl/winsys/cogl-winsys-glx-private.h
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
similarity index 100%
rename from cogl/winsys/cogl-winsys-glx.c
rename to cogl/cogl/winsys/cogl-winsys-glx.c
diff --git a/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-private.h
rename to cogl/cogl/winsys/cogl-winsys-private.h
diff --git a/cogl/winsys/cogl-winsys-stub-private.h b/cogl/cogl/winsys/cogl-winsys-stub-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-stub-private.h
rename to cogl/cogl/winsys/cogl-winsys-stub-private.h
diff --git a/cogl/winsys/cogl-winsys-stub.c b/cogl/cogl/winsys/cogl-winsys-stub.c
similarity index 100%
rename from cogl/winsys/cogl-winsys-stub.c
rename to cogl/cogl/winsys/cogl-winsys-stub.c
diff --git a/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c
similarity index 100%
rename from cogl/winsys/cogl-winsys.c
rename to cogl/cogl/winsys/cogl-winsys.c
diff --git a/config-custom.h b/cogl/config-custom.h
similarity index 100%
rename from config-custom.h
rename to cogl/config-custom.h
diff --git a/configure.ac b/cogl/configure.ac
similarity index 100%
rename from configure.ac
rename to cogl/configure.ac
diff --git a/test-fixtures/Makefile.am b/cogl/test-fixtures/Makefile.am
similarity index 100%
rename from test-fixtures/Makefile.am
rename to cogl/test-fixtures/Makefile.am
diff --git a/test-fixtures/test-unit.h b/cogl/test-fixtures/test-unit.h
similarity index 100%
rename from test-fixtures/test-unit.h
rename to cogl/test-fixtures/test-unit.h
diff --git a/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
similarity index 100%
rename from test-fixtures/test-utils.c
rename to cogl/test-fixtures/test-utils.c
diff --git a/test-fixtures/test-utils.h b/cogl/test-fixtures/test-utils.h
similarity index 100%
rename from test-fixtures/test-utils.h
rename to cogl/test-fixtures/test-utils.h
diff --git a/tests/Makefile.am b/cogl/tests/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to cogl/tests/Makefile.am
diff --git a/tests/README b/cogl/tests/README
similarity index 100%
rename from tests/README
rename to cogl/tests/README
diff --git a/tests/config.env.in b/cogl/tests/config.env.in
similarity index 100%
rename from tests/config.env.in
rename to cogl/tests/config.env.in
diff --git a/tests/conform/Makefile.am b/cogl/tests/conform/Makefile.am
similarity index 100%
rename from tests/conform/Makefile.am
rename to cogl/tests/conform/Makefile.am
diff --git a/tests/conform/test-alpha-test.c b/cogl/tests/conform/test-alpha-test.c
similarity index 100%
rename from tests/conform/test-alpha-test.c
rename to cogl/tests/conform/test-alpha-test.c
diff --git a/tests/conform/test-alpha-textures.c b/cogl/tests/conform/test-alpha-textures.c
similarity index 100%
rename from tests/conform/test-alpha-textures.c
rename to cogl/tests/conform/test-alpha-textures.c
diff --git a/tests/conform/test-atlas-migration.c b/cogl/tests/conform/test-atlas-migration.c
similarity index 100%
rename from tests/conform/test-atlas-migration.c
rename to cogl/tests/conform/test-atlas-migration.c
diff --git a/tests/conform/test-backface-culling.c b/cogl/tests/conform/test-backface-culling.c
similarity index 100%
rename from tests/conform/test-backface-culling.c
rename to cogl/tests/conform/test-backface-culling.c
diff --git a/tests/conform/test-blend-strings.c b/cogl/tests/conform/test-blend-strings.c
similarity index 100%
rename from tests/conform/test-blend-strings.c
rename to cogl/tests/conform/test-blend-strings.c
diff --git a/tests/conform/test-blend.c b/cogl/tests/conform/test-blend.c
similarity index 100%
rename from tests/conform/test-blend.c
rename to cogl/tests/conform/test-blend.c
diff --git a/tests/conform/test-color-hsl.c b/cogl/tests/conform/test-color-hsl.c
similarity index 100%
rename from tests/conform/test-color-hsl.c
rename to cogl/tests/conform/test-color-hsl.c
diff --git a/tests/conform/test-color-mask.c b/cogl/tests/conform/test-color-mask.c
similarity index 100%
rename from tests/conform/test-color-mask.c
rename to cogl/tests/conform/test-color-mask.c
diff --git a/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
similarity index 100%
rename from tests/conform/test-conform-main.c
rename to cogl/tests/conform/test-conform-main.c
diff --git a/tests/conform/test-copy-replace-texture.c b/cogl/tests/conform/test-copy-replace-texture.c
similarity index 100%
rename from tests/conform/test-copy-replace-texture.c
rename to cogl/tests/conform/test-copy-replace-texture.c
diff --git a/tests/conform/test-custom-attributes.c b/cogl/tests/conform/test-custom-attributes.c
similarity index 100%
rename from tests/conform/test-custom-attributes.c
rename to cogl/tests/conform/test-custom-attributes.c
diff --git a/tests/conform/test-depth-test.c b/cogl/tests/conform/test-depth-test.c
similarity index 100%
rename from tests/conform/test-depth-test.c
rename to cogl/tests/conform/test-depth-test.c
diff --git a/tests/conform/test-euler-quaternion.c b/cogl/tests/conform/test-euler-quaternion.c
similarity index 100%
rename from tests/conform/test-euler-quaternion.c
rename to cogl/tests/conform/test-euler-quaternion.c
diff --git a/tests/conform/test-fence.c b/cogl/tests/conform/test-fence.c
similarity index 100%
rename from tests/conform/test-fence.c
rename to cogl/tests/conform/test-fence.c
diff --git a/tests/conform/test-fixed.c b/cogl/tests/conform/test-fixed.c
similarity index 100%
rename from tests/conform/test-fixed.c
rename to cogl/tests/conform/test-fixed.c
diff --git a/tests/conform/test-fixtures.c b/cogl/tests/conform/test-fixtures.c
similarity index 100%
rename from tests/conform/test-fixtures.c
rename to cogl/tests/conform/test-fixtures.c
diff --git a/tests/conform/test-framebuffer-get-bits.c b/cogl/tests/conform/test-framebuffer-get-bits.c
similarity index 100%
rename from tests/conform/test-framebuffer-get-bits.c
rename to cogl/tests/conform/test-framebuffer-get-bits.c
diff --git a/tests/conform/test-gles2-context.c b/cogl/tests/conform/test-gles2-context.c
similarity index 100%
rename from tests/conform/test-gles2-context.c
rename to cogl/tests/conform/test-gles2-context.c
diff --git a/tests/conform/test-just-vertex-shader.c b/cogl/tests/conform/test-just-vertex-shader.c
similarity index 100%
rename from tests/conform/test-just-vertex-shader.c
rename to cogl/tests/conform/test-just-vertex-shader.c
diff --git a/tests/conform/test-layer-remove.c b/cogl/tests/conform/test-layer-remove.c
similarity index 100%
rename from tests/conform/test-layer-remove.c
rename to cogl/tests/conform/test-layer-remove.c
diff --git a/tests/conform/test-map-buffer-range.c b/cogl/tests/conform/test-map-buffer-range.c
similarity index 100%
rename from tests/conform/test-map-buffer-range.c
rename to cogl/tests/conform/test-map-buffer-range.c
diff --git a/tests/conform/test-materials.c b/cogl/tests/conform/test-materials.c
similarity index 100%
rename from tests/conform/test-materials.c
rename to cogl/tests/conform/test-materials.c
diff --git a/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c
similarity index 100%
rename from tests/conform/test-multitexture.c
rename to cogl/tests/conform/test-multitexture.c
diff --git a/tests/conform/test-no-gl-header.c b/cogl/tests/conform/test-no-gl-header.c
similarity index 100%
rename from tests/conform/test-no-gl-header.c
rename to cogl/tests/conform/test-no-gl-header.c
diff --git a/tests/conform/test-npot-texture.c b/cogl/tests/conform/test-npot-texture.c
similarity index 100%
rename from tests/conform/test-npot-texture.c
rename to cogl/tests/conform/test-npot-texture.c
diff --git a/tests/conform/test-object.c b/cogl/tests/conform/test-object.c
similarity index 100%
rename from tests/conform/test-object.c
rename to cogl/tests/conform/test-object.c
diff --git a/tests/conform/test-offscreen.c b/cogl/tests/conform/test-offscreen.c
similarity index 100%
rename from tests/conform/test-offscreen.c
rename to cogl/tests/conform/test-offscreen.c
diff --git a/tests/conform/test-path-clip.c b/cogl/tests/conform/test-path-clip.c
similarity index 100%
rename from tests/conform/test-path-clip.c
rename to cogl/tests/conform/test-path-clip.c
diff --git a/tests/conform/test-path.c b/cogl/tests/conform/test-path.c
similarity index 100%
rename from tests/conform/test-path.c
rename to cogl/tests/conform/test-path.c
diff --git a/tests/conform/test-pipeline-cache-unrefs-texture.c b/cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
similarity index 100%
rename from tests/conform/test-pipeline-cache-unrefs-texture.c
rename to cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
diff --git a/tests/conform/test-pipeline-shader-state.c b/cogl/tests/conform/test-pipeline-shader-state.c
similarity index 100%
rename from tests/conform/test-pipeline-shader-state.c
rename to cogl/tests/conform/test-pipeline-shader-state.c
diff --git a/tests/conform/test-pipeline-uniforms.c b/cogl/tests/conform/test-pipeline-uniforms.c
similarity index 100%
rename from tests/conform/test-pipeline-uniforms.c
rename to cogl/tests/conform/test-pipeline-uniforms.c
diff --git a/tests/conform/test-pipeline-user-matrix.c b/cogl/tests/conform/test-pipeline-user-matrix.c
similarity index 100%
rename from tests/conform/test-pipeline-user-matrix.c
rename to cogl/tests/conform/test-pipeline-user-matrix.c
diff --git a/tests/conform/test-pixel-buffer.c b/cogl/tests/conform/test-pixel-buffer.c
similarity index 100%
rename from tests/conform/test-pixel-buffer.c
rename to cogl/tests/conform/test-pixel-buffer.c
diff --git a/tests/conform/test-point-size-attribute.c b/cogl/tests/conform/test-point-size-attribute.c
similarity index 100%
rename from tests/conform/test-point-size-attribute.c
rename to cogl/tests/conform/test-point-size-attribute.c
diff --git a/tests/conform/test-point-size.c b/cogl/tests/conform/test-point-size.c
similarity index 100%
rename from tests/conform/test-point-size.c
rename to cogl/tests/conform/test-point-size.c
diff --git a/tests/conform/test-point-sprite.c b/cogl/tests/conform/test-point-sprite.c
similarity index 100%
rename from tests/conform/test-point-sprite.c
rename to cogl/tests/conform/test-point-sprite.c
diff --git a/tests/conform/test-premult.c b/cogl/tests/conform/test-premult.c
similarity index 100%
rename from tests/conform/test-premult.c
rename to cogl/tests/conform/test-premult.c
diff --git a/tests/conform/test-primitive-and-journal.c b/cogl/tests/conform/test-primitive-and-journal.c
similarity index 100%
rename from tests/conform/test-primitive-and-journal.c
rename to cogl/tests/conform/test-primitive-and-journal.c
diff --git a/tests/conform/test-primitive.c b/cogl/tests/conform/test-primitive.c
similarity index 100%
rename from tests/conform/test-primitive.c
rename to cogl/tests/conform/test-primitive.c
diff --git a/tests/conform/test-read-texture-formats.c b/cogl/tests/conform/test-read-texture-formats.c
similarity index 100%
rename from tests/conform/test-read-texture-formats.c
rename to cogl/tests/conform/test-read-texture-formats.c
diff --git a/tests/conform/test-readpixels.c b/cogl/tests/conform/test-readpixels.c
similarity index 100%
rename from tests/conform/test-readpixels.c
rename to cogl/tests/conform/test-readpixels.c
diff --git a/tests/conform/test-snippets.c b/cogl/tests/conform/test-snippets.c
similarity index 100%
rename from tests/conform/test-snippets.c
rename to cogl/tests/conform/test-snippets.c
diff --git a/tests/conform/test-sparse-pipeline.c b/cogl/tests/conform/test-sparse-pipeline.c
similarity index 100%
rename from tests/conform/test-sparse-pipeline.c
rename to cogl/tests/conform/test-sparse-pipeline.c
diff --git a/tests/conform/test-sub-texture.c b/cogl/tests/conform/test-sub-texture.c
similarity index 100%
rename from tests/conform/test-sub-texture.c
rename to cogl/tests/conform/test-sub-texture.c
diff --git a/tests/conform/test-texture-3d.c b/cogl/tests/conform/test-texture-3d.c
similarity index 100%
rename from tests/conform/test-texture-3d.c
rename to cogl/tests/conform/test-texture-3d.c
diff --git a/tests/conform/test-texture-get-set-data.c b/cogl/tests/conform/test-texture-get-set-data.c
similarity index 100%
rename from tests/conform/test-texture-get-set-data.c
rename to cogl/tests/conform/test-texture-get-set-data.c
diff --git a/tests/conform/test-texture-mipmaps.c b/cogl/tests/conform/test-texture-mipmaps.c
similarity index 100%
rename from tests/conform/test-texture-mipmaps.c
rename to cogl/tests/conform/test-texture-mipmaps.c
diff --git a/tests/conform/test-texture-no-allocate.c b/cogl/tests/conform/test-texture-no-allocate.c
similarity index 100%
rename from tests/conform/test-texture-no-allocate.c
rename to cogl/tests/conform/test-texture-no-allocate.c
diff --git a/tests/conform/test-texture-pixmap-x11.c b/cogl/tests/conform/test-texture-pixmap-x11.c
similarity index 100%
rename from tests/conform/test-texture-pixmap-x11.c
rename to cogl/tests/conform/test-texture-pixmap-x11.c
diff --git a/tests/conform/test-texture-rectangle.c b/cogl/tests/conform/test-texture-rectangle.c
similarity index 100%
rename from tests/conform/test-texture-rectangle.c
rename to cogl/tests/conform/test-texture-rectangle.c
diff --git a/tests/conform/test-texture-rg.c b/cogl/tests/conform/test-texture-rg.c
similarity index 100%
rename from tests/conform/test-texture-rg.c
rename to cogl/tests/conform/test-texture-rg.c
diff --git a/tests/conform/test-version.c b/cogl/tests/conform/test-version.c
similarity index 100%
rename from tests/conform/test-version.c
rename to cogl/tests/conform/test-version.c
diff --git a/tests/conform/test-vertex-buffer-contiguous.c b/cogl/tests/conform/test-vertex-buffer-contiguous.c
similarity index 100%
rename from tests/conform/test-vertex-buffer-contiguous.c
rename to cogl/tests/conform/test-vertex-buffer-contiguous.c
diff --git a/tests/conform/test-vertex-buffer-interleved.c b/cogl/tests/conform/test-vertex-buffer-interleved.c
similarity index 100%
rename from tests/conform/test-vertex-buffer-interleved.c
rename to cogl/tests/conform/test-vertex-buffer-interleved.c
diff --git a/tests/conform/test-vertex-buffer-mutability.c b/cogl/tests/conform/test-vertex-buffer-mutability.c
similarity index 100%
rename from tests/conform/test-vertex-buffer-mutability.c
rename to cogl/tests/conform/test-vertex-buffer-mutability.c
diff --git a/tests/conform/test-viewport.c b/cogl/tests/conform/test-viewport.c
similarity index 100%
rename from tests/conform/test-viewport.c
rename to cogl/tests/conform/test-viewport.c
diff --git a/tests/conform/test-wrap-modes.c b/cogl/tests/conform/test-wrap-modes.c
similarity index 100%
rename from tests/conform/test-wrap-modes.c
rename to cogl/tests/conform/test-wrap-modes.c
diff --git a/tests/conform/test-wrap-rectangle-textures.c b/cogl/tests/conform/test-wrap-rectangle-textures.c
similarity index 100%
rename from tests/conform/test-wrap-rectangle-textures.c
rename to cogl/tests/conform/test-wrap-rectangle-textures.c
diff --git a/tests/conform/test-write-texture-formats.c b/cogl/tests/conform/test-write-texture-formats.c
similarity index 100%
rename from tests/conform/test-write-texture-formats.c
rename to cogl/tests/conform/test-write-texture-formats.c
diff --git a/tests/data/Makefile.am b/cogl/tests/data/Makefile.am
similarity index 100%
rename from tests/data/Makefile.am
rename to cogl/tests/data/Makefile.am
diff --git a/tests/data/valgrind.suppressions b/cogl/tests/data/valgrind.suppressions
similarity index 100%
rename from tests/data/valgrind.suppressions
rename to cogl/tests/data/valgrind.suppressions
diff --git a/tests/micro-perf/Makefile.am b/cogl/tests/micro-perf/Makefile.am
similarity index 100%
rename from tests/micro-perf/Makefile.am
rename to cogl/tests/micro-perf/Makefile.am
diff --git a/tests/micro-perf/test-journal.c b/cogl/tests/micro-perf/test-journal.c
similarity index 100%
rename from tests/micro-perf/test-journal.c
rename to cogl/tests/micro-perf/test-journal.c
diff --git a/tests/run-tests.sh b/cogl/tests/run-tests.sh
similarity index 100%
rename from tests/run-tests.sh
rename to cogl/tests/run-tests.sh
diff --git a/tests/test-launcher.sh b/cogl/tests/test-launcher.sh
similarity index 100%
rename from tests/test-launcher.sh
rename to cogl/tests/test-launcher.sh
diff --git a/tests/unit/Makefile.am b/cogl/tests/unit/Makefile.am
similarity index 100%
rename from tests/unit/Makefile.am
rename to cogl/tests/unit/Makefile.am
diff --git a/tests/unit/test-unit-main.c b/cogl/tests/unit/test-unit-main.c
similarity index 100%
rename from tests/unit/test-unit-main.c
rename to cogl/tests/unit/test-unit-main.c