diff --git a/po/POTFILES.in b/po/POTFILES.in
index 972cc26b..ed36f056 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,16 +17,16 @@ data/ui/weather-settings.ui
 data/ui/window.ui
 data/ui/year-view.ui
 src/gcal-application.c
-src/gcal-date-selector.c
-src/gcal-edit-dialog.c
-src/gcal-event-widget.c
-src/gcal-manager.c
-src/gcal-quick-add-popover.c
-src/gcal-source-dialog.c
-src/gcal-time-selector.c
-src/gcal-window.c
 src/main.c
 src/core/gcal-event.c
+src/core/gcal-manager.c
+src/gui/gcal-date-selector.c
+src/gui/gcal-edit-dialog.c
+src/gui/gcal-event-widget.c
+src/gui/gcal-quick-add-popover.c
+src/gui/gcal-source-dialog.c
+src/gui/gcal-time-selector.c
+src/gui/gcal-window.c
 src/utils/gcal-utils.c
 src/views/gcal-month-view.c
 src/views/gcal-week-grid.c
diff --git a/src/gcal-calendar-popover.c b/src/gui/gcal-calendar-popover.c
similarity index 100%
rename from src/gcal-calendar-popover.c
rename to src/gui/gcal-calendar-popover.c
diff --git a/src/gcal-calendar-popover.h b/src/gui/gcal-calendar-popover.h
similarity index 100%
rename from src/gcal-calendar-popover.h
rename to src/gui/gcal-calendar-popover.h
diff --git a/src/gcal-date-chooser-day.c b/src/gui/gcal-date-chooser-day.c
similarity index 100%
rename from src/gcal-date-chooser-day.c
rename to src/gui/gcal-date-chooser-day.c
diff --git a/src/gcal-date-chooser-day.h b/src/gui/gcal-date-chooser-day.h
similarity index 100%
rename from src/gcal-date-chooser-day.h
rename to src/gui/gcal-date-chooser-day.h
diff --git a/src/gcal-date-chooser.c b/src/gui/gcal-date-chooser.c
similarity index 100%
rename from src/gcal-date-chooser.c
rename to src/gui/gcal-date-chooser.c
diff --git a/src/gcal-date-chooser.h b/src/gui/gcal-date-chooser.h
similarity index 100%
rename from src/gcal-date-chooser.h
rename to src/gui/gcal-date-chooser.h
diff --git a/src/gcal-date-selector.c b/src/gui/gcal-date-selector.c
similarity index 100%
rename from src/gcal-date-selector.c
rename to src/gui/gcal-date-selector.c
diff --git a/src/gcal-date-selector.h b/src/gui/gcal-date-selector.h
similarity index 100%
rename from src/gcal-date-selector.h
rename to src/gui/gcal-date-selector.h
diff --git a/src/gcal-edit-dialog.c b/src/gui/gcal-edit-dialog.c
similarity index 100%
rename from src/gcal-edit-dialog.c
rename to src/gui/gcal-edit-dialog.c
diff --git a/src/gcal-edit-dialog.h b/src/gui/gcal-edit-dialog.h
similarity index 100%
rename from src/gcal-edit-dialog.h
rename to src/gui/gcal-edit-dialog.h
diff --git a/src/gcal-event-widget.c b/src/gui/gcal-event-widget.c
similarity index 100%
rename from src/gcal-event-widget.c
rename to src/gui/gcal-event-widget.c
diff --git a/src/gcal-event-widget.h b/src/gui/gcal-event-widget.h
similarity index 100%
rename from src/gcal-event-widget.h
rename to src/gui/gcal-event-widget.h
diff --git a/src/gcal-multi-choice.c b/src/gui/gcal-multi-choice.c
similarity index 100%
rename from src/gcal-multi-choice.c
rename to src/gui/gcal-multi-choice.c
diff --git a/src/gcal-multi-choice.h b/src/gui/gcal-multi-choice.h
similarity index 100%
rename from src/gcal-multi-choice.h
rename to src/gui/gcal-multi-choice.h
diff --git a/src/gcal-quick-add-popover.c b/src/gui/gcal-quick-add-popover.c
similarity index 100%
rename from src/gcal-quick-add-popover.c
rename to src/gui/gcal-quick-add-popover.c
diff --git a/src/gcal-quick-add-popover.h b/src/gui/gcal-quick-add-popover.h
similarity index 100%
rename from src/gcal-quick-add-popover.h
rename to src/gui/gcal-quick-add-popover.h
diff --git a/src/gcal-source-dialog.c b/src/gui/gcal-source-dialog.c
similarity index 100%
rename from src/gcal-source-dialog.c
rename to src/gui/gcal-source-dialog.c
diff --git a/src/gcal-source-dialog.h b/src/gui/gcal-source-dialog.h
similarity index 100%
rename from src/gcal-source-dialog.h
rename to src/gui/gcal-source-dialog.h
diff --git a/src/gcal-time-selector.c b/src/gui/gcal-time-selector.c
similarity index 100%
rename from src/gcal-time-selector.c
rename to src/gui/gcal-time-selector.c
diff --git a/src/gcal-time-selector.h b/src/gui/gcal-time-selector.h
similarity index 100%
rename from src/gcal-time-selector.h
rename to src/gui/gcal-time-selector.h
diff --git a/src/gcal-window.c b/src/gui/gcal-window.c
similarity index 100%
rename from src/gcal-window.c
rename to src/gui/gcal-window.c
diff --git a/src/gcal-window.h b/src/gui/gcal-window.h
similarity index 100%
rename from src/gcal-window.h
rename to src/gui/gcal-window.h
diff --git a/src/meson.build b/src/meson.build
index 4bb54f64..eb794f50 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,6 +26,17 @@ sources = files(
   'core/gcal-manager.c',
   'core/gcal-recurrence.c',
   'core/gcal-timer.c',
+  'gui/gcal-calendar-popover.c',
+  'gui/gcal-date-chooser.c',
+  'gui/gcal-date-chooser-day.c',
+  'gui/gcal-date-selector.c',
+  'gui/gcal-edit-dialog.c',
+  'gui/gcal-event-widget.c',
+  'gui/gcal-multi-choice.c',
+  'gui/gcal-quick-add-popover.c',
+  'gui/gcal-source-dialog.c',
+  'gui/gcal-time-selector.c',
+  'gui/gcal-window.c',
   'search/gcal-search-button.c',
   'search/gcal-search-engine.c',
   'search/gcal-search-hit.c',
@@ -47,22 +58,11 @@ sources = files(
   'weather/gcal-weather-service.c',
   'weather/gcal-weather-settings.c',
   'gcal-application.c',
-  'gcal-calendar-popover.c',
   'gcal-context.c',
-  'gcal-date-chooser-day.c',
-  'gcal-date-chooser.c',
-  'gcal-date-selector.c',
-  'gcal-edit-dialog.c',
-  'gcal-event-widget.c',
   'gcal-log.c',
-  'gcal-multi-choice.c',
   'gcal-night-light-monitor.c',
-  'gcal-quick-add-popover.c',
   'gcal-shell-search-provider.c',
-  'gcal-source-dialog.c',
-  'gcal-time-selector.c',
   'gcal-time-zone-monitor.c',
-  'gcal-window.c',
 )
 
 enum_types = 'gcal-enum-types'
@@ -115,6 +115,7 @@ sources += configure_file(
 calendar_incs = [
   top_inc,
   include_directories('core'),
+  include_directories('gui'),
   include_directories('search'),
   include_directories('utils'),
   include_directories('views'),