diff --git a/src/gui/event-editor/event-editor.gresource.xml b/src/gui/event-editor/event-editor.gresource.xml
new file mode 100644
index 00000000..2c8606f0
--- /dev/null
+++ b/src/gui/event-editor/event-editor.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/event-editor">
+    <file compressed="true">gcal-alarm-row.ui</file>
+    <file compressed="true">gcal-date-chooser.ui</file>
+    <file compressed="true">gcal-date-selector.ui</file>
+    <file compressed="true">gcal-edit-dialog.ui</file>
+    <file compressed="true">gcal-multi-choice.ui</file>
+    <file compressed="true">gcal-time-selector.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/gui/gcal-alarm-row.c b/src/gui/event-editor/gcal-alarm-row.c
similarity index 99%
rename from src/gui/gcal-alarm-row.c
rename to src/gui/event-editor/gcal-alarm-row.c
index 1ada82f4..9de60bd4 100644
--- a/src/gui/gcal-alarm-row.c
+++ b/src/gui/event-editor/gcal-alarm-row.c
@@ -335,7 +335,7 @@ gcal_alarm_row_class_init (GcalAlarmRowClass *klass)
                                         G_TYPE_NONE,
                                         0);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-alarm-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-alarm-row.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalAlarmRow, volume_button);
   gtk_widget_class_bind_template_child (widget_class, GcalAlarmRow, volume_icon);
diff --git a/src/gui/gcal-alarm-row.h b/src/gui/event-editor/gcal-alarm-row.h
similarity index 100%
rename from src/gui/gcal-alarm-row.h
rename to src/gui/event-editor/gcal-alarm-row.h
diff --git a/src/gui/gcal-alarm-row.ui b/src/gui/event-editor/gcal-alarm-row.ui
similarity index 100%
rename from src/gui/gcal-alarm-row.ui
rename to src/gui/event-editor/gcal-alarm-row.ui
diff --git a/src/gui/gcal-date-chooser-day.c b/src/gui/event-editor/gcal-date-chooser-day.c
similarity index 100%
rename from src/gui/gcal-date-chooser-day.c
rename to src/gui/event-editor/gcal-date-chooser-day.c
diff --git a/src/gui/gcal-date-chooser-day.h b/src/gui/event-editor/gcal-date-chooser-day.h
similarity index 100%
rename from src/gui/gcal-date-chooser-day.h
rename to src/gui/event-editor/gcal-date-chooser-day.h
diff --git a/src/gui/gcal-date-chooser.c b/src/gui/event-editor/gcal-date-chooser.c
similarity index 99%
rename from src/gui/gcal-date-chooser.c
rename to src/gui/event-editor/gcal-date-chooser.c
index 9915feba..949a138d 100644
--- a/src/gui/gcal-date-chooser.c
+++ b/src/gui/event-editor/gcal-date-chooser.c
@@ -485,7 +485,7 @@ gcal_date_chooser_class_init (GcalDateChooserClass *class)
 
   widget_class->drag_data_received = calendar_drag_data_received;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-date-chooser.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-chooser.ui");
 
   properties[PROP_DATE] = g_param_spec_boxed ("date",
                                               "Date",
diff --git a/src/gui/gcal-date-chooser.h b/src/gui/event-editor/gcal-date-chooser.h
similarity index 100%
rename from src/gui/gcal-date-chooser.h
rename to src/gui/event-editor/gcal-date-chooser.h
diff --git a/src/gui/gcal-date-chooser.ui b/src/gui/event-editor/gcal-date-chooser.ui
similarity index 100%
rename from src/gui/gcal-date-chooser.ui
rename to src/gui/event-editor/gcal-date-chooser.ui
diff --git a/src/gui/gcal-date-selector.c b/src/gui/event-editor/gcal-date-selector.c
similarity index 99%
rename from src/gui/gcal-date-selector.c
rename to src/gui/event-editor/gcal-date-selector.c
index c3aae8b4..ad06215d 100644
--- a/src/gui/gcal-date-selector.c
+++ b/src/gui/event-editor/gcal-date-selector.c
@@ -214,7 +214,7 @@ gcal_date_selector_class_init (GcalDateSelectorClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-date-selector.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-date-selector.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalDateSelector, date_chooser);
   gtk_widget_class_bind_template_child (widget_class, GcalDateSelector, date_selector_popover);
diff --git a/src/gui/gcal-date-selector.h b/src/gui/event-editor/gcal-date-selector.h
similarity index 100%
rename from src/gui/gcal-date-selector.h
rename to src/gui/event-editor/gcal-date-selector.h
diff --git a/src/gui/gcal-date-selector.ui b/src/gui/event-editor/gcal-date-selector.ui
similarity index 100%
rename from src/gui/gcal-date-selector.ui
rename to src/gui/event-editor/gcal-date-selector.ui
diff --git a/src/gui/gcal-edit-dialog.c b/src/gui/event-editor/gcal-edit-dialog.c
similarity index 99%
rename from src/gui/gcal-edit-dialog.c
rename to src/gui/event-editor/gcal-edit-dialog.c
index 5494a700..b8577ed9 100644
--- a/src/gui/gcal-edit-dialog.c
+++ b/src/gui/event-editor/gcal-edit-dialog.c
@@ -1314,7 +1314,7 @@ gcal_edit_dialog_class_init (GcalEditDialogClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-edit-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-edit-dialog.ui");
 
   /* Alarms */
   gtk_widget_class_bind_template_child (widget_class, GcalEditDialog, five_minutes_button);
diff --git a/src/gui/gcal-edit-dialog.h b/src/gui/event-editor/gcal-edit-dialog.h
similarity index 100%
rename from src/gui/gcal-edit-dialog.h
rename to src/gui/event-editor/gcal-edit-dialog.h
diff --git a/src/gui/gcal-edit-dialog.ui b/src/gui/event-editor/gcal-edit-dialog.ui
similarity index 100%
rename from src/gui/gcal-edit-dialog.ui
rename to src/gui/event-editor/gcal-edit-dialog.ui
diff --git a/src/gui/gcal-multi-choice.c b/src/gui/event-editor/gcal-multi-choice.c
similarity index 99%
rename from src/gui/gcal-multi-choice.c
rename to src/gui/event-editor/gcal-multi-choice.c
index fca95995..559824d9 100644
--- a/src/gui/gcal-multi-choice.c
+++ b/src/gui/event-editor/gcal-multi-choice.c
@@ -426,7 +426,7 @@ gcal_multi_choice_class_init (GcalMultiChoiceClass *class)
                   NULL,
                   G_TYPE_NONE, 0);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/gui/gcal-multi-choice.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/event-editor/gcal-multi-choice.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GcalMultiChoice, down_button);
   gtk_widget_class_bind_template_child (widget_class, GcalMultiChoice, up_button);
diff --git a/src/gui/gcal-multi-choice.h b/src/gui/event-editor/gcal-multi-choice.h
similarity index 100%
rename from src/gui/gcal-multi-choice.h
rename to src/gui/event-editor/gcal-multi-choice.h
diff --git a/src/gui/gcal-multi-choice.ui b/src/gui/event-editor/gcal-multi-choice.ui
similarity index 100%
rename from src/gui/gcal-multi-choice.ui
rename to src/gui/event-editor/gcal-multi-choice.ui
diff --git a/src/gui/gcal-time-selector.c b/src/gui/event-editor/gcal-time-selector.c
similarity index 99%
rename from src/gui/gcal-time-selector.c
rename to src/gui/event-editor/gcal-time-selector.c
index d43a4910..ea719d51 100644
--- a/src/gui/gcal-time-selector.c
+++ b/src/gui/event-editor/gcal-time-selector.c
@@ -208,7 +208,7 @@ gcal_time_selector_class_init (GcalTimeSelectorClass *klass)
                                                        G_TYPE_DATE_TIME,
                                                        G_PARAM_READWRITE));
 
-  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/calendar/ui/gui/gcal-time-selector.ui");
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/calendar/ui/event-editor/gcal-time-selector.ui");
 
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, hour_adjustment);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (klass), GcalTimeSelector, hour_spin);
diff --git a/src/gui/gcal-time-selector.h b/src/gui/event-editor/gcal-time-selector.h
similarity index 100%
rename from src/gui/gcal-time-selector.h
rename to src/gui/event-editor/gcal-time-selector.h
diff --git a/src/gui/gcal-time-selector.ui b/src/gui/event-editor/gcal-time-selector.ui
similarity index 100%
rename from src/gui/gcal-time-selector.ui
rename to src/gui/event-editor/gcal-time-selector.ui
diff --git a/src/gui/event-editor/meson.build b/src/gui/event-editor/meson.build
new file mode 100644
index 00000000..fd969335
--- /dev/null
+++ b/src/gui/event-editor/meson.build
@@ -0,0 +1,17 @@
+calendar_incs +=  include_directories('.')
+
+built_sources += gnome.compile_resources(
+  'event-editor-resources',
+  'event-editor.gresource.xml',
+  c_name: 'event_editor',
+)
+
+sources += files(
+  'gcal-alarm-row.c',
+  'gcal-date-chooser.c',
+  'gcal-date-chooser-day.c',
+  'gcal-date-selector.c',
+  'gcal-edit-dialog.c',
+  'gcal-multi-choice.c',
+  'gcal-time-selector.c',
+)
diff --git a/src/gui/gui.gresource.xml b/src/gui/gui.gresource.xml
index 1fd3d768..5c481b5b 100644
--- a/src/gui/gui.gresource.xml
+++ b/src/gui/gui.gresource.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/calendar/ui/gui">
-    <file compressed="true">gcal-alarm-row.ui</file>
     <file compressed="true">gcal-calendar-popover.ui</file>
-    <file compressed="true">gcal-date-chooser.ui</file>
-    <file compressed="true">gcal-date-selector.ui</file>
-    <file compressed="true">gcal-edit-dialog.ui</file>
     <file compressed="true">gcal-event-widget.ui</file>
     <file compressed="true">gcal-quick-add-popover.ui</file>
-    <file compressed="true">gcal-multi-choice.ui</file>
-    <file compressed="true">gcal-time-selector.ui</file>
     <file compressed="true">gcal-weather-settings.ui</file>
     <file compressed="true">gcal-window.ui</file>
   </gresource>
diff --git a/src/gui/meson.build b/src/gui/meson.build
index 0a2d473a..80d866b7 100644
--- a/src/gui/meson.build
+++ b/src/gui/meson.build
@@ -1,4 +1,5 @@
 subdir('calendar-management')
+subdir('event-editor')
 subdir('gtk')
 subdir('views')
 
@@ -11,18 +12,11 @@ built_sources += gnome.compile_resources(
 )
 
 sources += files(
-  'gcal-alarm-row.c',
   'gcal-application.c',
   'gcal-calendar-popover.c',
-  'gcal-date-chooser.c',
-  'gcal-date-chooser-day.c',
-  'gcal-date-selector.c',
-  'gcal-edit-dialog.c',
   'gcal-event-widget.c',
-  'gcal-multi-choice.c',
   'gcal-quick-add-popover.c',
   'gcal-search-button.c',
-  'gcal-time-selector.c',
   'gcal-weather-settings.c',
   'gcal-window.c',
 )