diff --git a/labwc.h b/include/labwc.h
similarity index 100%
rename from labwc.h
rename to include/labwc.h
diff --git a/meson.build b/meson.build
index a8ec163d..01d0d941 100644
--- a/meson.build
+++ b/meson.build
@@ -18,64 +18,40 @@ add_project_arguments(
 
 cc = meson.get_compiler('c')
 
-add_project_arguments(cc.get_supported_arguments([
-	'-Wundef',
-	'-Wlogical-op',
-	'-Wmissing-include-dirs',
-	'-Wold-style-definition',
-	'-Wpointer-arith',
-	'-Winit-self',
-	'-Wstrict-prototypes',
-	'-Wimplicit-fallthrough=2',
-	'-Wendif-labels',
-	'-Wstrict-aliasing=2',
-	'-Woverflow',
-	'-Wmissing-prototypes',
-	'-Wno-missing-braces',
-	'-Wno-missing-field-initializers',
-	'-Wno-unused-parameter',
-]), language: 'c')
+add_project_arguments(cc.get_supported_arguments(
+  [
+    '-Wno-unused-parameter',
+    '-Wundef',
+  ]),
+  language: 'c',
+)
 
 wlroots_proj = subproject(
-	'wlroots',
-	default_options: ['examples=false'],
-	required: false,
+  'wlroots',
+  default_options: ['examples=false'],
+  required: false,
 )
-if wlroots_proj.found()
-	wlroots = wlroots_proj.get_variable('wlroots')
-else
-	wlroots = dependency('wlroots', version: '>= 0.10.0')
-endif
 
-wayland_protos = dependency('wayland-protocols')
-wayland_server = dependency('wayland-server')
-xkbcommon      = dependency('xkbcommon')
+if wlroots_proj.found()
+  wlroots       = wlroots_proj.get_variable('wlroots')
+else
+  wlroots       = dependency('wlroots', version: '>= 0.10.0')
+endif
+wayland_server  = dependency('wayland-server')
+wayland_protos  = dependency('wayland-protocols')
+xkbcommon       = dependency('xkbcommon')
+
+labwc_inc       = include_directories('include')
 
 subdir('protocols')
+subdir('src')
 
-labwc_sources = [
-  'main.c',
-  'server.c',
-  'output.c',
-  'view.c',
-  'xdg.c',
-  'xwl.c',
-  'deco.c',
-  'dbg.c',
-]
-
-labwc_headers = [
-  'labwc.h',
-]
+labwc_deps      = [ server_protos, wayland_server, wlroots, xkbcommon, ]
 
 executable(
   meson.project_name(),
-  labwc_sources + labwc_headers,
-  dependencies: [
-    server_protos,
-    wayland_server,
-    wlroots,
-    xkbcommon,
-  ],
+  labwc_sources,
+  include_directories: [labwc_inc],
+  dependencies: labwc_deps,
   install: true,
 )
diff --git a/dbg.c b/src/debug/dbg.c
similarity index 100%
rename from dbg.c
rename to src/debug/dbg.c
diff --git a/src/debug/meson.build b/src/debug/meson.build
new file mode 100644
index 00000000..ef59ebe6
--- /dev/null
+++ b/src/debug/meson.build
@@ -0,0 +1,3 @@
+labwc_sources += files(
+  'dbg.c',
+)
diff --git a/deco.c b/src/deco.c
similarity index 100%
rename from deco.c
rename to src/deco.c
diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 00000000..36fc8a26
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,11 @@
+labwc_sources = files(
+  'main.c',
+  'server.c',
+  'output.c',
+  'view.c',
+  'xdg.c',
+  'xwl.c',
+  'deco.c',
+)
+
+subdir('debug')
diff --git a/output.c b/src/output.c
similarity index 100%
rename from output.c
rename to src/output.c
diff --git a/server.c b/src/server.c
similarity index 100%
rename from server.c
rename to src/server.c
diff --git a/view.c b/src/view.c
similarity index 100%
rename from view.c
rename to src/view.c
diff --git a/xdg.c b/src/xdg.c
similarity index 100%
rename from xdg.c
rename to src/xdg.c
diff --git a/xwl.c b/src/xwl.c
similarity index 100%
rename from xwl.c
rename to src/xwl.c