diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 28eff49a..9bf24e3d 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 
 #include "shell.h"
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "weston-desktop-shell-server-protocol.h"
 #include <libweston/config-parser.h>
 #include "shared/helpers.h"
diff --git a/compositor/cms-colord.c b/frontend/cms-colord.c
similarity index 100%
rename from compositor/cms-colord.c
rename to frontend/cms-colord.c
diff --git a/compositor/cms-helper.c b/frontend/cms-helper.c
similarity index 100%
rename from compositor/cms-helper.c
rename to frontend/cms-helper.c
diff --git a/compositor/cms-helper.h b/frontend/cms-helper.h
similarity index 100%
rename from compositor/cms-helper.h
rename to frontend/cms-helper.h
diff --git a/compositor/cms-static.c b/frontend/cms-static.c
similarity index 100%
rename from compositor/cms-static.c
rename to frontend/cms-static.c
diff --git a/compositor/config-helpers.c b/frontend/config-helpers.c
similarity index 100%
rename from compositor/config-helpers.c
rename to frontend/config-helpers.c
diff --git a/compositor/executable.c b/frontend/executable.c
similarity index 100%
rename from compositor/executable.c
rename to frontend/executable.c
diff --git a/compositor/main.c b/frontend/main.c
similarity index 100%
rename from compositor/main.c
rename to frontend/main.c
diff --git a/compositor/meson.build b/frontend/meson.build
similarity index 100%
rename from compositor/meson.build
rename to frontend/meson.build
diff --git a/compositor/screen-share.c b/frontend/screen-share.c
similarity index 100%
rename from compositor/screen-share.c
rename to frontend/screen-share.c
diff --git a/compositor/systemd-notify.c b/frontend/systemd-notify.c
similarity index 100%
rename from compositor/systemd-notify.c
rename to frontend/systemd-notify.c
diff --git a/compositor/text-backend.c b/frontend/text-backend.c
similarity index 100%
rename from compositor/text-backend.c
rename to frontend/text-backend.c
diff --git a/compositor/weston-private.h b/frontend/weston-private.h
similarity index 100%
rename from compositor/weston-private.h
rename to frontend/weston-private.h
diff --git a/compositor/weston-screenshooter.c b/frontend/weston-screenshooter.c
similarity index 100%
rename from compositor/weston-screenshooter.c
rename to frontend/weston-screenshooter.c
diff --git a/compositor/weston.desktop b/frontend/weston.desktop
similarity index 100%
rename from compositor/weston.desktop
rename to frontend/weston.desktop
diff --git a/compositor/weston.h b/frontend/weston.h
similarity index 100%
rename from compositor/weston.h
rename to frontend/weston.h
diff --git a/compositor/xwayland.c b/frontend/xwayland.c
similarity index 99%
rename from compositor/xwayland.c
rename to frontend/xwayland.c
index b83de09b..8d80a048 100644
--- a/compositor/xwayland.c
+++ b/frontend/xwayland.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 
 #include <libweston/libweston.h>
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include <libweston/xwayland-api.h>
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"
diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index 94033897..8bedf55a 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include <libweston/libweston.h>
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "fullscreen-shell-unstable-v1-server-protocol.h"
 #include "shared/helpers.h"
 #include <libweston/shell-utils.h>
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index d3bf2641..4e774f21 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -65,7 +65,7 @@
 #include "ivi-hmi-controller-server-protocol.h"
 #include "shared/helpers.h"
 #include "shared/xalloc.h"
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 
 /*****************************************************************************
  *  structure, globals
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index ea7b2333..54a8842c 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -61,7 +61,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include <libweston/libweston.h>
 #include "ivi-shell.h"
 #include "ivi-layout-export.h"
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 66658b8c..4114b531 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -50,7 +50,7 @@
 #include "libweston/libweston.h"
 #include "shared/helpers.h"
 #include "shared/xalloc.h"
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 
 /* Representation of ivi_surface protocol object. */
 struct ivi_shell_surface
diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c
index beda3f36..03071ae5 100644
--- a/kiosk-shell/kiosk-shell.c
+++ b/kiosk-shell/kiosk-shell.c
@@ -31,7 +31,7 @@
 
 #include "kiosk-shell.h"
 #include "kiosk-shell-grab.h"
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "libweston/libweston.h"
 #include "shared/helpers.h"
 #include <libweston/shell-utils.h>
diff --git a/meson.build b/meson.build
index 35854826..3955943a 100644
--- a/meson.build
+++ b/meson.build
@@ -162,7 +162,7 @@ subdir('protocol')
 subdir('shared')
 subdir('libweston')
 subdir('xwayland')
-subdir('compositor')
+subdir('frontend')
 subdir('desktop-shell')
 subdir('fullscreen-shell')
 subdir('ivi-shell')
diff --git a/tests/ivi-layout-test-plugin.c b/tests/ivi-layout-test-plugin.c
index 9f0ecafb..90f27630 100644
--- a/tests/ivi-layout-test-plugin.c
+++ b/tests/ivi-layout-test-plugin.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include <libweston/libweston.h>
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "weston-test-server-protocol.h"
 #include "ivi-test.h"
 #include "ivi-shell/ivi-layout-export.h"
diff --git a/tests/surface-screenshot-test.c b/tests/surface-screenshot-test.c
index 3d93ac58..7552fe94 100644
--- a/tests/surface-screenshot-test.c
+++ b/tests/surface-screenshot-test.c
@@ -34,7 +34,7 @@
 #include <linux/input.h>
 
 #include <libweston/libweston.h>
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "shared/file-util.h"
 #include "libweston-internal.h"
 
diff --git a/tests/weston-test-desktop-shell.c b/tests/weston-test-desktop-shell.c
index bd6478e1..9c0fbe53 100644
--- a/tests/weston-test-desktop-shell.c
+++ b/tests/weston-test-desktop-shell.c
@@ -36,7 +36,7 @@
 #include <math.h>
 #include <sys/types.h>
 
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include <libweston/config-parser.h>
 #include "shared/helpers.h"
 #include <libweston/shell-utils.h>
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 5a64ed9c..420ec5a0 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -40,7 +40,7 @@
 #include <libweston/weston-log.h>
 #include "backend.h"
 #include "libweston-internal.h"
-#include "compositor/weston.h"
+#include "frontend/weston.h"
 #include "weston-test-server-protocol.h"
 #include "weston.h"
 #include "weston-testsuite-data.h"