73 files changed, 146 insertions, 230 deletions

diff --git a/configure.ac b/configure.ac
index 16bd798..62e0a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ m4_define([mbwm2_api_version],
 
 AC_PREREQ(2.59)
 AC_INIT([matchbox-window-manager-2], mbwm2_version, [mallum@handhelds.org])
-AC_CONFIG_SRCDIR([matchbox2/core/mb-window-manager.c])
+AC_CONFIG_SRCDIR([matchbox2/mb-window-manager.c])
 
 AM_INIT_AUTOMAKE()
 AM_SILENT_RULES([yes])
@@ -309,10 +309,6 @@ AC_OUTPUT([
 Makefile
 matchbox2/Makefile
 matchbox2/mb-wm-config.h
-matchbox2/core/Makefile
-matchbox2/client-types/Makefile
-matchbox2/comp-mgr/Makefile
-matchbox2/theme-engines/Makefile
 managers/Makefile
 managers/simple/Makefile
 managers/maemo/Makefile
diff --git a/matchbox2/comp-mgr/README b/doc/comp-mgr-overview.txt
index fb53cf1..fb53cf1 100644
--- a/matchbox2/comp-mgr/README
+++ b/doc/comp-mgr-overview.txt
diff --git a/doc/reference/matchbox2/Makefile.am b/doc/reference/matchbox2/Makefile.am
index 952c6cd..f3987d6 100644
--- a/doc/reference/matchbox2/Makefile.am
+++ b/doc/reference/matchbox2/Makefile.am
@@ -44,10 +44,7 @@ FIXXREF_OPTIONS=\
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/matchbox2/core/*.h \
-	   $(top_srcdir)/matchbox2/comp-mgr/*.h \
-	   $(top_srcdir)/matchbox2/client-types/*.h \
-	   $(top_srcdir)/matchbox2/theme-engines/*.h
+HFILE_GLOB=$(top_srcdir)/matchbox2/*.h
 CFILE_GLOB=
 
 # Header files to ignore when scanning.
diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c
index a27313f..b6dd958 100644
--- a/managers/simple/matchbox-window-manager-2-simple.c
+++ b/managers/simple/matchbox-window-manager-2-simple.c
@@ -1,7 +1,4 @@
-#include "mb-wm.h"
-#include "mb-wm-client-app.h"
-#include "mb-wm-client-panel.h"
-#include "mb-wm-client-dialog.h"
+#include <matchbox2/mb-wm.h>
 #include <signal.h>
 
 #if ENABLE_CLUTTER_COMPOSITE_MANAGER
diff --git a/matchbox2/Makefile.am b/matchbox2/Makefile.am
index 3f90f3c..47dfdc8 100644
--- a/matchbox2/Makefile.am
+++ b/matchbox2/Makefile.am
@@ -1,31 +1,99 @@
-if ENABLE_COMPOSITE
-comp=comp-mgr
-complib= \
-	client-types/libmb-wm-client-override.la \
-	$(comp)/libmatchbox-window-manager-2-compmgr.la
-endif
 
-MAINTAINERCLEANFILES = Makefile.in
+lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
 
-pkgincludedir = $(includedir)/$(MBWM2_INCDIR)
+source_public_h = \
+  mb-wm.h
 
-SUBDIRS = core client-types theme-engines $(comp)
+# Core...
+source = \
+  mb-wm-types.h \
+  mb-wm-macros.h \
+  mb-wm-object.h \
+  mb-wm-object-props.h \
+  mb-wm-object.c \
+  mb-wm-debug.h \
+  mb-wm-debug.c \
+  mb-wm-client.h \
+  mb-wm-client.c \
+  mb-wm-client-base.h \
+  mb-wm-client-base.c \
+  mb-wm-client-window.h \
+  mb-wm-client-window.c \
+  mb-wm-root-window.h \
+  mb-wm-root-window.c \
+  mb-wm-stack.h \
+  mb-wm-stack.c \
+  mb-wm-props.h \
+  mb-wm-props.c \
+  mb-wm-util.h \
+  mb-wm-util.c \
+  mb-wm-atoms.h \
+  mb-wm-atoms.c \
+  mb-wm-layout.h \
+  mb-wm-layout.c \
+  mb-wm-keys.h \
+  mb-wm-keys.c \
+  mb-wm-decor.h \
+  mb-wm-decor.c \
+  mb-window-manager.h \
+  mb-window-manager.c \
+  mb-wm-main-context.h \
+  mb-wm-main-context.c \
+  xas.h \
+  xas.c
 
-lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
+# Client window types...
+source += \
+  mb-wm-client-app.h \
+  mb-wm-client-app.c \
+  mb-wm-client-panel.h \
+  mb-wm-client-panel.c \
+  mb-wm-client-dialog.h \
+  mb-wm-client-dialog.c \
+  mb-wm-client-note.h \
+  mb-wm-client-note.c \
+  mb-wm-client-input.h \
+  mb-wm-client-input.c \
+  mb-wm-client-desktop.h \
+  mb-wm-client-desktop.c \
+  mb-wm-client-menu.h \
+  mb-wm-client-menu.c \
+  mb-wm-client-override.h \
+  mb-wm-client-override.c
+
+
+# Compositing...
+if ENABLE_COMPOSITE
+source += mb-wm-comp-mgr.h
+source += mb-wm-comp-mgr.c
 
+if COMP_MGR_BACKEND
+if ENABLE_CLUTTER_COMPOSITE_MANAGER
+source += mb-wm-comp-mgr-clutter.h
+source += mb-wm-comp-mgr-clutter.c
+else
+source += mb-wm-comp-mgr-xrender.h
+source += mb-wm-comp-mgr-xrender.c
+endif
+endif
+
+endif #ENABLE_COMPOSITE
+
+# Theming...
+source += \
+  mb-wm-theme.h \
+  mb-wm-theme.c \
+  mb-wm-theme-xml.h \
+  mb-wm-theme-xml.c
+
+if THEME_PNG
+source += mb-wm-theme-png.c mb-wm-theme-png.h
+endif
 
-libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = \
-			core/libmatchbox-window-manager-2-core.la \
-                        client-types/libmb-wm-client-app.la \
-			client-types/libmb-wm-client-desktop.la \
-			client-types/libmb-wm-client-dialog.la \
-			client-types/libmb-wm-client-input.la \
-			client-types/libmb-wm-client-menu.la \
-			client-types/libmb-wm-client-note.la \
-			client-types/libmb-wm-client-panel.la \
-			theme-engines/libmb-theme.la \
-			$(complib)
+pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/matchbox2
+pkginclude_HEADERS = $(source_public_h)
 
-libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES =
+libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES = $(source_public_h) $(source)
+libmatchbox2_@MBWM2_API_VERSION@_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
+libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = $(MBWM_LIBS)
 
-pkginclude_HEADERS = *.h
diff --git a/matchbox2/client-types/Makefile.am b/matchbox2/client-types/Makefile.am
deleted file mode 100644
index 545be9c..0000000
--- a/matchbox2/client-types/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-if ENABLE_COMPOSITE
-compmgr_libs = libmb-wm-client-override.la
-compmgr_ltlibs = libmb-wm-client-override.la
-endif
-
-THEME_LIBS = $(MBWM_THEME_LIBS)/libmb-theme.la
-
-INCLUDES     = $(MBWM_INCS) $(MBWM_CFLAGS)
-LDADD        =$(THEME_LIBS)
-DEPENDENCIES = $(THEME_LIBS)
-
-pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/client-types
-
-pkginclude_HEADERS = mb-wm-client-app.h \
-		     mb-wm-client-dialog.h \
-		     mb-wm-client-menu.h \
-		     mb-wm-client-override.h \
-		     mb-wm-client-desktop.h \
-		     mb-wm-client-input.h \
-		     mb-wm-client-note.h \
-		     mb-wm-client-panel.h
-
-noinst_LTLIBRARIES = libmb-wm-client-app.la	\
-	             libmb-wm-client-panel.la	\
-	             libmb-wm-client-dialog.la	\
-	             libmb-wm-client-note.la	\
-		     libmb-wm-client-input.la	\
-		     libmb-wm-client-desktop.la    \
-		     libmb-wm-client-menu.la	\
-		     $(compmgr_ltlibs)
-
-libmb_wm_client_app_la_SOURCES     = mb-wm-client-app.c mb-wm-client-app.h
-libmb_wm_client_panel_la_SOURCES   = mb-wm-client-panel.c mb-wm-client-panel.h
-libmb_wm_client_dialog_la_SOURCES  = mb-wm-client-dialog.c mb-wm-client-dialog.h
-libmb_wm_client_note_la_SOURCES    = mb-wm-client-note.c mb-wm-client-note.h
-libmb_wm_client_input_la_SOURCES   = mb-wm-client-input.c mb-wm-client-input.h
-libmb_wm_client_desktop_la_SOURCES = mb-wm-client-desktop.c mb-wm-client-desktop.h
-libmb_wm_client_menu_la_SOURCES    = mb-wm-client-menu.c mb-wm-client-menu.h
-libmb_wm_client_override_la_SOURCES= mb-wm-client-override.c \
-				    mb-wm-client-override.h
-libmb_wm_client_app_la_CFLAGS =
-libmb_wm_client_panel_la_CFLAGS =
-libmb_wm_client_dialog_la_CFLAGS =
-libmb_wm_client_note_la_CFLAGS =
-libmb_wm_client_input_la_CFLAGS =
-libmb_wm_client_desktop_la_CFLAGS =
-libmb_wm_client_menu_la_CFLAGS =
-libmb_wm_client_override_la_CFLAGS =
-
-MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/matchbox2/comp-mgr/Makefile.am b/matchbox2/comp-mgr/Makefile.am
deleted file mode 100644
index 1868c80..0000000
--- a/matchbox2/comp-mgr/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-
-core_h    = mb-wm-comp-mgr.h
-core_c    = mb-wm-comp-mgr.c
-
-if COMP_MGR_BACKEND
-if ENABLE_CLUTTER_COMPOSITE_MANAGER
-clutter_h = mb-wm-comp-clutter.h
-clutter_c = mb-wm-comp-mgr-clutter.c
-else
-xrender_h = mb-wm-comp-mgr-xrender.h
-xrender_c = mb-wm-comp-mgr-xrender.c
-endif
-endif
-
-pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/comp-mgr
-
-pkginclude_HEADERS = mb-wm-comp-mgr-clutter.h  mb-wm-comp-mgr.h  mb-wm-comp-mgr-xrender.h
-
-noinst_LTLIBRARIES = libmatchbox-window-manager-2-compmgr.la
-libmatchbox_window_manager_2_compmgr_la_SOURCES = $(core_h) $(core_c) \
-						  $(xrender_h) $(xrender_c) \
-						  $(clutter_h) $(clutter_c)
-libmatchbox_window_manager_2_compmgr_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS)
-
-MAINTAINERCLEANFILES = Makefile.in
-
diff --git a/matchbox2/core/Makefile.am b/matchbox2/core/Makefile.am
deleted file mode 100644
index c356a0b..0000000
--- a/matchbox2/core/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-core_h  = mb-wm.h             	\
-          mb-wm-macros.h      	\
-          mb-wm-debug.h       	\
-          mb-wm-object.h      	\
-          mb-wm-object-props.h 	\
-          mb-wm-client.h      	\
-          mb-wm-client-base.h 	\
-	  mb-wm-client-window.h \
-	  mb-wm-root-window.h 	\
-          mb-wm-stack.h       	\
-          mb-wm-util.h        	\
-          mb-wm-types.h       	\
-	  mb-wm-atoms.h       	\
-          mb-wm-layout.h      	\
-          mb-wm-props.h       	\
-          mb-wm-keys.h        	\
-          mb-wm-decor.h        	\
-	  mb-window-manager.h	\
-	  mb-wm-main-context.h	\
-          xas.h
-
-core_c  = mb-wm-object.c      	\
-          mb-wm-debug.c       	\
-          mb-wm-client.c      	\
-          mb-wm-client-base.c 	\
-	  mb-wm-client-window.c \
-	  mb-wm-root-window.c   \
-          mb-wm-stack.c       	\
-          mb-wm-props.c       	\
-          mb-wm-util.c        	\
-	  mb-wm-atoms.c       	\
-          mb-wm-layout.c      	\
-          mb-wm-keys.c        	\
-          mb-wm-decor.c       	\
-	  mb-window-manager.c	\
-	  mb-wm-main-context.c	\
-          xas.c
-
-pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/core
-
-pkginclude_HEADERS = $(core_h)
-
-noinst_LTLIBRARIES =  libmatchbox-window-manager-2-core.la
-libmatchbox_window_manager_2_core_la_SOURCES = $(core_h) $(core_c)
-libmatchbox_window_manager_2_core_la_CFLAGS =  $(MBWM_INCS) $(MBWM_CFLAGS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/matchbox2/core/mb-window-manager.c b/matchbox2/mb-window-manager.c
index c1a19f2..6468873 100644
--- a/matchbox2/core/mb-window-manager.c
+++ b/matchbox2/mb-window-manager.c
@@ -19,14 +19,14 @@
  *
  */
 #include "mb-wm.h"
-#include "../client-types/mb-wm-client-app.h"
-#include "../client-types/mb-wm-client-panel.h"
-#include "../client-types/mb-wm-client-dialog.h"
-#include "../client-types/mb-wm-client-desktop.h"
-#include "../client-types/mb-wm-client-input.h"
-#include "../client-types/mb-wm-client-note.h"
-#include "../client-types/mb-wm-client-menu.h"
-#include "../theme-engines/mb-wm-theme.h"
+#include "mb-wm-client-app.h"
+#include "mb-wm-client-panel.h"
+#include "mb-wm-client-dialog.h"
+#include "mb-wm-client-desktop.h"
+#include "mb-wm-client-input.h"
+#include "mb-wm-client-note.h"
+#include "mb-wm-client-menu.h"
+#include "mb-wm-theme.h"
 
 #if ENABLE_COMPOSITE
 # include "mb-wm-comp-mgr.h"
@@ -36,7 +36,7 @@
 #  else
 #   include "mb-wm-comp-mgr-xrender.h"
 #  endif
-# include "../client-types/mb-wm-client-override.h"
+# include "mb-wm-client-override.h"
 # include <X11/extensions/Xdamage.h>
 # include <X11/extensions/Xrender.h>
 # include <X11/extensions/Xcomposite.h>
diff --git a/matchbox2/core/mb-window-manager.h b/matchbox2/mb-window-manager.h
index 4b73d35..ff22fe5 100644
--- a/matchbox2/core/mb-window-manager.h
+++ b/matchbox2/mb-window-manager.h
@@ -22,9 +22,9 @@
 #define _HAVE_MB_WM_WINDOW_MANAGER_H
 
 #include <matchbox2/mb-wm-config.h>
-#include <matchbox2/core/mb-wm-object.h>
-#include <matchbox2/core/mb-wm-root-window.h>
-#include <matchbox2/core/xas.h>
+#include <matchbox2/mb-wm-object.h>
+#include <matchbox2/mb-wm-root-window.h>
+#include <matchbox2/xas.h>
 
 typedef struct MBWindowManagerClass   MBWindowManagerClass;
 typedef struct MBWindowManagerPriv    MBWindowManagerPriv;
diff --git a/matchbox2/core/mb-wm-atoms.c b/matchbox2/mb-wm-atoms.c
index 5d7e805..5d7e805 100644
--- a/matchbox2/core/mb-wm-atoms.c
+++ b/matchbox2/mb-wm-atoms.c
diff --git a/matchbox2/core/mb-wm-atoms.h b/matchbox2/mb-wm-atoms.h
index ef06083..ef06083 100644
--- a/matchbox2/core/mb-wm-atoms.h
+++ b/matchbox2/mb-wm-atoms.h
diff --git a/matchbox2/client-types/mb-wm-client-app.c b/matchbox2/mb-wm-client-app.c
index 3aa9d2e..3aa9d2e 100644
--- a/matchbox2/client-types/mb-wm-client-app.c
+++ b/matchbox2/mb-wm-client-app.c
diff --git a/matchbox2/client-types/mb-wm-client-app.h b/matchbox2/mb-wm-client-app.h
index c058d0c..bb6f05d 100644
--- a/matchbox2/client-types/mb-wm-client-app.h
+++ b/matchbox2/mb-wm-client-app.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_APP_H
 #define _HAVE_MB_CLIENT_APP_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientApp      MBWMClientApp;
 typedef struct MBWMClientAppClass MBWMClientAppClass;
diff --git a/matchbox2/core/mb-wm-client-base.c b/matchbox2/mb-wm-client-base.c
index daa679d..daa679d 100644
--- a/matchbox2/core/mb-wm-client-base.c
+++ b/matchbox2/mb-wm-client-base.c
diff --git a/matchbox2/core/mb-wm-client-base.h b/matchbox2/mb-wm-client-base.h
index edc8008..edc8008 100644
--- a/matchbox2/core/mb-wm-client-base.h
+++ b/matchbox2/mb-wm-client-base.h
diff --git a/matchbox2/client-types/mb-wm-client-desktop.c b/matchbox2/mb-wm-client-desktop.c
index 81ce628..81ce628 100644
--- a/matchbox2/client-types/mb-wm-client-desktop.c
+++ b/matchbox2/mb-wm-client-desktop.c
diff --git a/matchbox2/client-types/mb-wm-client-desktop.h b/matchbox2/mb-wm-client-desktop.h
index c132cdb..fc63dbc 100644
--- a/matchbox2/client-types/mb-wm-client-desktop.h
+++ b/matchbox2/mb-wm-client-desktop.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DESKTOP_H
 #define _HAVE_MB_CLIENT_DESKTOP_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientDesktop      MBWMClientDesktop;
 typedef struct MBWMClientDesktopClass MBWMClientDesktopClass;
diff --git a/matchbox2/client-types/mb-wm-client-dialog.c b/matchbox2/mb-wm-client-dialog.c
index e4bcdfb..e4bcdfb 100644
--- a/matchbox2/client-types/mb-wm-client-dialog.c
+++ b/matchbox2/mb-wm-client-dialog.c
diff --git a/matchbox2/client-types/mb-wm-client-dialog.h b/matchbox2/mb-wm-client-dialog.h
index de9db01..9c2c54d 100644
--- a/matchbox2/client-types/mb-wm-client-dialog.h
+++ b/matchbox2/mb-wm-client-dialog.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DIALOG_H
 #define _HAVE_MB_CLIENT_DIALOG_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientDialog      MBWMClientDialog;
 typedef struct MBWMClientDialogClass MBWMClientDialogClass;
diff --git a/matchbox2/client-types/mb-wm-client-input.c b/matchbox2/mb-wm-client-input.c
index 3a63d40..3a63d40 100644
--- a/matchbox2/client-types/mb-wm-client-input.c
+++ b/matchbox2/mb-wm-client-input.c
diff --git a/matchbox2/client-types/mb-wm-client-input.h b/matchbox2/mb-wm-client-input.h
index ea63bd6..ea8908c 100644
--- a/matchbox2/client-types/mb-wm-client-input.h
+++ b/matchbox2/mb-wm-client-input.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_INPUT_H
 #define _HAVE_MB_CLIENT_INPUT_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientInput      MBWMClientInput;
 typedef struct MBWMClientInputClass MBWMClientInputClass;
diff --git a/matchbox2/client-types/mb-wm-client-menu.c b/matchbox2/mb-wm-client-menu.c
index b68f771..b68f771 100644
--- a/matchbox2/client-types/mb-wm-client-menu.c
+++ b/matchbox2/mb-wm-client-menu.c
diff --git a/matchbox2/client-types/mb-wm-client-menu.h b/matchbox2/mb-wm-client-menu.h
index ac54e86..00552ba 100644
--- a/matchbox2/client-types/mb-wm-client-menu.h
+++ b/matchbox2/mb-wm-client-menu.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_MENU_H
 #define _HAVE_MB_CLIENT_MENU_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientMenu      MBWMClientMenu;
 typedef struct MBWMClientMenuClass MBWMClientMenuClass;
diff --git a/matchbox2/client-types/mb-wm-client-note.c b/matchbox2/mb-wm-client-note.c
index d0bb770..d0bb770 100644
--- a/matchbox2/client-types/mb-wm-client-note.c
+++ b/matchbox2/mb-wm-client-note.c
diff --git a/matchbox2/client-types/mb-wm-client-note.h b/matchbox2/mb-wm-client-note.h
index d2390ae..b9d062a 100644
--- a/matchbox2/client-types/mb-wm-client-note.h
+++ b/matchbox2/mb-wm-client-note.h
@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_CLIENT_NOTE_H
 #define _HAVE_MB_CLIENT_NOTE_H
 
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/client-types/mb-wm-client-dialog.h>
+#include <matchbox2/mb-wm.h>
+#include <matchbox2/mb-wm-client-dialog.h>
 
 typedef struct MBWMClientNote      MBWMClientNote;
 typedef struct MBWMClientNoteClass MBWMClientNoteClass;
diff --git a/matchbox2/client-types/mb-wm-client-override.c b/matchbox2/mb-wm-client-override.c
index 238ce73..238ce73 100644
--- a/matchbox2/client-types/mb-wm-client-override.c
+++ b/matchbox2/mb-wm-client-override.c
diff --git a/matchbox2/client-types/mb-wm-client-override.h b/matchbox2/mb-wm-client-override.h
index a804a39..a187bd3 100644
--- a/matchbox2/client-types/mb-wm-client-override.h
+++ b/matchbox2/mb-wm-client-override.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_OVERRIDE_H
 #define _HAVE_MB_CLIENT_OVERRIDE_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientOverride      MBWMClientOverride;
 typedef struct MBWMClientOverrideClass MBWMClientOverrideClass;
diff --git a/matchbox2/client-types/mb-wm-client-panel.c b/matchbox2/mb-wm-client-panel.c
index c915d6b..c915d6b 100644
--- a/matchbox2/client-types/mb-wm-client-panel.c
+++ b/matchbox2/mb-wm-client-panel.c
diff --git a/matchbox2/client-types/mb-wm-client-panel.h b/matchbox2/mb-wm-client-panel.h
index 4be2585..db38216 100644
--- a/matchbox2/client-types/mb-wm-client-panel.h
+++ b/matchbox2/mb-wm-client-panel.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_PANEL_H
 #define _HAVE_MB_CLIENT_PANEL_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MBWMClientPanel      MBWMClientPanel;
 typedef struct MBWMClientPanelClass MBWMClientPanelClass;
diff --git a/matchbox2/core/mb-wm-client-window.c b/matchbox2/mb-wm-client-window.c
index 19aa703..19aa703 100644
--- a/matchbox2/core/mb-wm-client-window.c
+++ b/matchbox2/mb-wm-client-window.c
diff --git a/matchbox2/core/mb-wm-client-window.h b/matchbox2/mb-wm-client-window.h
index 287f881..287f881 100644
--- a/matchbox2/core/mb-wm-client-window.h
+++ b/matchbox2/mb-wm-client-window.h
diff --git a/matchbox2/core/mb-wm-client.c b/matchbox2/mb-wm-client.c
index f88a8d8..f88a8d8 100644
--- a/matchbox2/core/mb-wm-client.c
+++ b/matchbox2/mb-wm-client.c
diff --git a/matchbox2/core/mb-wm-client.h b/matchbox2/mb-wm-client.h
index 6b63c8e..6b63c8e 100644
--- a/matchbox2/core/mb-wm-client.h
+++ b/matchbox2/mb-wm-client.h
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox2/mb-wm-comp-mgr-clutter.c
index 0fd5472..0fd5472 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.c
+++ b/matchbox2/mb-wm-comp-mgr-clutter.c
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.h b/matchbox2/mb-wm-comp-mgr-clutter.h
index 8c719d9..8c719d9 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.h
+++ b/matchbox2/mb-wm-comp-mgr-clutter.h
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.c b/matchbox2/mb-wm-comp-mgr-xrender.c
index fe7f75b..fe7f75b 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.c
+++ b/matchbox2/mb-wm-comp-mgr-xrender.c
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.h b/matchbox2/mb-wm-comp-mgr-xrender.h
index 0a36bbc..0a36bbc 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.h
+++ b/matchbox2/mb-wm-comp-mgr-xrender.h
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr.c b/matchbox2/mb-wm-comp-mgr.c
index 68063c3..68063c3 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr.c
+++ b/matchbox2/mb-wm-comp-mgr.c
diff --git a/matchbox2/comp-mgr/mb-wm-comp-mgr.h b/matchbox2/mb-wm-comp-mgr.h
index 98e9cbd..98e9cbd 100644
--- a/matchbox2/comp-mgr/mb-wm-comp-mgr.h
+++ b/matchbox2/mb-wm-comp-mgr.h
diff --git a/matchbox2/core/mb-wm-debug.c b/matchbox2/mb-wm-debug.c
index 75d6e63..75d6e63 100644
--- a/matchbox2/core/mb-wm-debug.c
+++ b/matchbox2/mb-wm-debug.c
diff --git a/matchbox2/core/mb-wm-debug.h b/matchbox2/mb-wm-debug.h
index 4c10be4..4c10be4 100644
--- a/matchbox2/core/mb-wm-debug.h
+++ b/matchbox2/mb-wm-debug.h
diff --git a/matchbox2/core/mb-wm-decor.c b/matchbox2/mb-wm-decor.c
index f4f171b..f4f171b 100644
--- a/matchbox2/core/mb-wm-decor.c
+++ b/matchbox2/mb-wm-decor.c
diff --git a/matchbox2/core/mb-wm-decor.h b/matchbox2/mb-wm-decor.h
index 6adeadf..6adeadf 100644
--- a/matchbox2/core/mb-wm-decor.h
+++ b/matchbox2/mb-wm-decor.h
diff --git a/matchbox2/core/mb-wm-keys.c b/matchbox2/mb-wm-keys.c
index 7c32105..7c32105 100644
--- a/matchbox2/core/mb-wm-keys.c
+++ b/matchbox2/mb-wm-keys.c
diff --git a/matchbox2/core/mb-wm-keys.h b/matchbox2/mb-wm-keys.h
index 0269274..b16fe95 100644
--- a/matchbox2/core/mb-wm-keys.h
+++ b/matchbox2/mb-wm-keys.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_KEYS_H
 #define _HAVE_MB_WM_KEYS_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 void
 mb_wm_keys_binding_remove_all (MBWindowManager    *wm);
diff --git a/matchbox2/core/mb-wm-layout.c b/matchbox2/mb-wm-layout.c
index 793276c..793276c 100644
--- a/matchbox2/core/mb-wm-layout.c
+++ b/matchbox2/mb-wm-layout.c
diff --git a/matchbox2/core/mb-wm-layout.h b/matchbox2/mb-wm-layout.h
index 81db28d..7d824ee 100644
--- a/matchbox2/core/mb-wm-layout.h
+++ b/matchbox2/mb-wm-layout.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_LAYOUT_MANAGER_H
 #define _HAVE_MB_WM_LAYOUT_MANAGER_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 #define MB_WM_LAYOUT(c) ((MBWMLayout*)(c))
 #define MB_WM_LAYOUT_CLASS(c) ((MBWMLayoutClass*)(c))
diff --git a/matchbox2/core/mb-wm-macros.h b/matchbox2/mb-wm-macros.h
index 5c8ab4b..5c8ab4b 100644
--- a/matchbox2/core/mb-wm-macros.h
+++ b/matchbox2/mb-wm-macros.h
diff --git a/matchbox2/core/mb-wm-main-context.c b/matchbox2/mb-wm-main-context.c
index 71d5d6c..71d5d6c 100644
--- a/matchbox2/core/mb-wm-main-context.c
+++ b/matchbox2/mb-wm-main-context.c
diff --git a/matchbox2/core/mb-wm-main-context.h b/matchbox2/mb-wm-main-context.h
index d9ce7b0..b8be944 100644
--- a/matchbox2/core/mb-wm-main-context.h
+++ b/matchbox2/mb-wm-main-context.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_MAIN_CONTEXT_H
 #define _HAVE_MB_MAIN_CONTEXT_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 #include <poll.h>
 
 #define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c))
diff --git a/matchbox2/core/mb-wm-object-props.h b/matchbox2/mb-wm-object-props.h
index c2d9fb4..44b3d98 100644
--- a/matchbox2/core/mb-wm-object-props.h
+++ b/matchbox2/mb-wm-object-props.h
@@ -2,7 +2,7 @@
 #ifndef _HAVE_MB_OBJECT_PROPS_H
 #define _HAVE_MB_OBJECT_PROPS_H
 
-#include <matchbox2/core/mb-wm-types.h>
+#include <matchbox2/mb-wm-types.h>
 
 /*
  * MBWMObject construction properties
diff --git a/matchbox2/core/mb-wm-object.c b/matchbox2/mb-wm-object.c
index 09a6ad4..09a6ad4 100644
--- a/matchbox2/core/mb-wm-object.c
+++ b/matchbox2/mb-wm-object.c
diff --git a/matchbox2/core/mb-wm-object.h b/matchbox2/mb-wm-object.h
index 62a04ae..6fa0cdc 100644
--- a/matchbox2/core/mb-wm-object.h
+++ b/matchbox2/mb-wm-object.h
@@ -22,7 +22,7 @@
 #define _HAVE_MB_OBJECT_H
 
 #include <stdarg.h>
-#include <matchbox2/core/mb-wm-object-props.h>
+#include <matchbox2/mb-wm-object-props.h>
 
 typedef struct MBWMObject       MBWMObject;
 typedef struct MBWMObjectClass  MBWMObjectClass;
diff --git a/matchbox2/core/mb-wm-props.c b/matchbox2/mb-wm-props.c
index 01a74bb..01a74bb 100644
--- a/matchbox2/core/mb-wm-props.c
+++ b/matchbox2/mb-wm-props.c
diff --git a/matchbox2/core/mb-wm-props.h b/matchbox2/mb-wm-props.h
index 07418ca..07418ca 100644
--- a/matchbox2/core/mb-wm-props.h
+++ b/matchbox2/mb-wm-props.h
diff --git a/matchbox2/core/mb-wm-root-window.c b/matchbox2/mb-wm-root-window.c
index 62016bb..8fb9053 100644
--- a/matchbox2/core/mb-wm-root-window.c
+++ b/matchbox2/mb-wm-root-window.c
@@ -20,9 +20,9 @@
 
 #include "mb-wm.h"
 
-#include "../theme-engines/mb-wm-theme.h"
-#include "../client-types/mb-wm-client-dialog.h"
-#include "../client-types/mb-wm-client-app.h"
+#include "mb-wm-theme.h"
+#include "mb-wm-client-dialog.h"
+#include "mb-wm-client-app.h"
 
 #include <X11/Xmd.h>
 
diff --git a/matchbox2/core/mb-wm-root-window.h b/matchbox2/mb-wm-root-window.h
index 7d3cdbe..7d3cdbe 100644
--- a/matchbox2/core/mb-wm-root-window.h
+++ b/matchbox2/mb-wm-root-window.h
diff --git a/matchbox2/core/mb-wm-stack.c b/matchbox2/mb-wm-stack.c
index f75b228..f75b228 100644
--- a/matchbox2/core/mb-wm-stack.c
+++ b/matchbox2/mb-wm-stack.c
diff --git a/matchbox2/core/mb-wm-stack.h b/matchbox2/mb-wm-stack.h
index 58afc45..58afc45 100644
--- a/matchbox2/core/mb-wm-stack.h
+++ b/matchbox2/mb-wm-stack.h
diff --git a/matchbox2/theme-engines/mb-wm-theme-png.c b/matchbox2/mb-wm-theme-png.c
index a747691..a747691 100644
--- a/matchbox2/theme-engines/mb-wm-theme-png.c
+++ b/matchbox2/mb-wm-theme-png.c
diff --git a/matchbox2/theme-engines/mb-wm-theme-png.h b/matchbox2/mb-wm-theme-png.h
index bfc4c18..e134c9b 100644
--- a/matchbox2/theme-engines/mb-wm-theme-png.h
+++ b/matchbox2/mb-wm-theme-png.h
@@ -22,7 +22,7 @@
 #define _HAVE_MB_WM_THEME_PNG_H
 
 #include <matchbox2/mb-wm-config.h>
-#include <matchbox2/theme-engines/mb-wm-theme.h>
+#include <matchbox2/mb-wm-theme.h>
 
 #include <X11/extensions/Xrender.h>
 
diff --git a/matchbox2/theme-engines/mb-wm-theme-xml.c b/matchbox2/mb-wm-theme-xml.c
index e075b7b..e075b7b 100644
--- a/matchbox2/theme-engines/mb-wm-theme-xml.c
+++ b/matchbox2/mb-wm-theme-xml.c
diff --git a/matchbox2/theme-engines/mb-wm-theme-xml.h b/matchbox2/mb-wm-theme-xml.h
index 8388985..00ea589 100644
--- a/matchbox2/theme-engines/mb-wm-theme-xml.h
+++ b/matchbox2/mb-wm-theme-xml.h
@@ -1,8 +1,8 @@
 #ifndef _HAVE_MB_WM_THEME_PRIVATE_H
 #define _HAVE_MB_WM_THEME_PRIVATE_H
 
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/theme-engines/mb-wm-theme.h>
+#include <matchbox2/mb-wm.h>
+#include <matchbox2/mb-wm-theme.h>
 /*
  * Helper structs for xml theme
  */
diff --git a/matchbox2/theme-engines/mb-wm-theme.c b/matchbox2/mb-wm-theme.c
index 93e8fe7..93e8fe7 100644
--- a/matchbox2/theme-engines/mb-wm-theme.c
+++ b/matchbox2/mb-wm-theme.c
diff --git a/matchbox2/theme-engines/mb-wm-theme.h b/matchbox2/mb-wm-theme.h
index 4c25297..fb4b6f5 100644
--- a/matchbox2/theme-engines/mb-wm-theme.h
+++ b/matchbox2/mb-wm-theme.h
@@ -22,7 +22,7 @@
 #define _HAVE_MB_WM_THEME_H
 
 #include <matchbox2/mb-wm-config.h>
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 #define MB_WM_THEME(c) ((MBWMTheme*)(c))
 #define MB_WM_THEME_CLASS(c) ((MBWMThemeClass*)(c))
diff --git a/matchbox2/core/mb-wm-types.h b/matchbox2/mb-wm-types.h
index 9c1c71a..9c1c71a 100644
--- a/matchbox2/core/mb-wm-types.h
+++ b/matchbox2/mb-wm-types.h
diff --git a/matchbox2/core/mb-wm-util.c b/matchbox2/mb-wm-util.c
index 792cb81..792cb81 100644
--- a/matchbox2/core/mb-wm-util.c
+++ b/matchbox2/mb-wm-util.c
diff --git a/matchbox2/core/mb-wm-util.h b/matchbox2/mb-wm-util.h
index c9bd6b5..66a0149 100644
--- a/matchbox2/core/mb-wm-util.h
+++ b/matchbox2/mb-wm-util.h
@@ -1,7 +1,7 @@
 #ifndef _MB_HAVE_UTIL_H
 #define _MB_HAVE_UTIL_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 /* See http://rlove.org/log/2005102601 */
 #if __GNUC__ >= 3
diff --git a/matchbox2/core/mb-wm.h b/matchbox2/mb-wm.h
index 0643510..2e2db49 100644
--- a/matchbox2/core/mb-wm.h
+++ b/matchbox2/mb-wm.h
@@ -32,7 +32,7 @@
 #include <X11/keysym.h>         /* key mask defines */
 
 #include <matchbox2/mb-wm-config.h>
-#include <matchbox2/core/xas.h>    		/* async stuff not needed for xlib on xcb */
+#include <matchbox2/xas.h>    		/* async stuff not needed for xlib on xcb */
 
 #ifndef TRUE
 #define TRUE 1
@@ -42,21 +42,21 @@
 #define FALSE 0
 #endif
 
-#include <matchbox2/core/mb-wm-macros.h>
-#include <matchbox2/core/mb-wm-debug.h>
-#include <matchbox2/core/mb-wm-types.h>
-#include <matchbox2/core/mb-wm-util.h>
-#include <matchbox2/core/mb-wm-object.h>
-#include <matchbox2/core/mb-wm-atoms.h>
-#include <matchbox2/core/mb-wm-props.h>
-#include <matchbox2/core/mb-wm-keys.h>
-#include <matchbox2/core/mb-wm-decor.h>
-#include <matchbox2/core/mb-wm-client-window.h>
-#include <matchbox2/core/mb-wm-root-window.h>
-#include <matchbox2/core/mb-wm-client.h>
-#include <matchbox2/core/mb-wm-client-base.h>
-#include <matchbox2/core/mb-wm-layout.h>
-#include <matchbox2/core/mb-wm-stack.h>
-#include <matchbox2/core/mb-window-manager.h>
-#include <matchbox2/core/mb-wm-main-context.h>
+#include <matchbox2/mb-wm-macros.h>
+#include <matchbox2/mb-wm-debug.h>
+#include <matchbox2/mb-wm-types.h>
+#include <matchbox2/mb-wm-util.h>
+#include <matchbox2/mb-wm-object.h>
+#include <matchbox2/mb-wm-atoms.h>
+#include <matchbox2/mb-wm-props.h>
+#include <matchbox2/mb-wm-keys.h>
+#include <matchbox2/mb-wm-decor.h>
+#include <matchbox2/mb-wm-client-window.h>
+#include <matchbox2/mb-wm-root-window.h>
+#include <matchbox2/mb-wm-client.h>
+#include <matchbox2/mb-wm-client-base.h>
+#include <matchbox2/mb-wm-layout.h>
+#include <matchbox2/mb-wm-stack.h>
+#include <matchbox2/mb-window-manager.h>
+#include <matchbox2/mb-wm-main-context.h>
 #endif
diff --git a/matchbox2/theme-engines/Makefile.am b/matchbox2/theme-engines/Makefile.am
deleted file mode 100644
index 1ec6599..0000000
--- a/matchbox2/theme-engines/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-if THEME_PNG
-PNG_SRC = mb-wm-theme-png.c mb-wm-theme-png.h
-endif
-
-COMMON_SRC = mb-wm-theme.h mb-wm-theme.c mb-wm-theme-xml.h mb-wm-theme-xml.c
-
-pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/theme-engines
-
-pkginclude_HEADERS = mb-wm-theme.h  mb-wm-theme-png.h  mb-wm-theme-xml.h
-
-noinst_LTLIBRARIES = libmb-theme.la
-libmb_theme_la_SOURCES = $(COMMON_SRC) $(PNG_SRC)
-libmb_theme_la_CFLAGS =
-
-INCLUDES = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
-
-MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/matchbox2/core/xas.c b/matchbox2/xas.c
index 47329dc..47329dc 100644
--- a/matchbox2/core/xas.c
+++ b/matchbox2/xas.c
diff --git a/matchbox2/core/xas.h b/matchbox2/xas.h
index e9b7ca8..e9b7ca8 100644
--- a/matchbox2/core/xas.h
+++ b/matchbox2/xas.h