diff --git a/meson.build b/meson.build
index bec08967..08e58edf 100644
--- a/meson.build
+++ b/meson.build
@@ -135,7 +135,6 @@ bison = generator(find_program('bison'),
 
 rofi_sources = files(
         'source/rofi.c',
-        'source/view.c',
         'source/mode.c',
         'source/keyb.c',
         'config/config.c',
@@ -154,7 +153,6 @@ rofi_sources = files(
         'source/widgets/scrollbar.c',
         'source/xrmoptions.c',
         'source/rofi-types.c',
-        'source/xcb.c',
         'source/dialogs/run.c',
         'source/dialogs/ssh.c',
         'source/dialogs/drun.c',
@@ -163,6 +161,8 @@ rofi_sources = files(
         'source/dialogs/window.c',
         'source/dialogs/script.c',
         'source/dialogs/help-keys.c',
+        'source/xcb/display.c',
+        'source/xcb/view.c',
         'include/display.h',
         'include/xcb.h',
         'include/xcb-internal.h',
diff --git a/source/xcb.c b/source/xcb/display.c
similarity index 100%
rename from source/xcb.c
rename to source/xcb/display.c
diff --git a/source/view.c b/source/xcb/view.c
similarity index 100%
rename from source/view.c
rename to source/xcb/view.c