diff --git a/src/Makefile.am b/src/Makefile.am
index 153d8b9..f1e551c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,11 @@
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/ag.gresource.xml)
+RESOURCE_DIR = $(srcdir)/resources
+resource_files = $(shell glib-compile-resources --sourcedir=$(RESOURCE_DIR) --generate-dependencies $(srcdir)/ag.gresource.xml)
 
 ag-resources.c: ag.gresource.xml $(resource_files)
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name ag $(srcdir)/ag.gresource.xml
+	glib-compile-resources --target=$@ --sourcedir=$(RESOURCE_DIR) --generate-source --c-name ag $(srcdir)/ag.gresource.xml
 
 ag-resources.h: ag.gresource.xml $(resource_files)
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name ag $(srcdir)/ag.gresource.xml
+	glib-compile-resources --target=$@ --sourcedir=$(RESOURCE_DIR) --generate-header --c-name ag $(srcdir)/ag.gresource.xml
 
 BUILT_SOURCES = \
 				ag-resources.h \
@@ -33,7 +34,3 @@ astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $
 astrognome_LDFLAGS = -rdynamic
 astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) -Wall
 
-guidir = $(pkgdatadir)
-gui_DATA = astrognome.ui
-
-EXTRA_DIST += $(gui_DATA)
diff --git a/src/ag-app.c b/src/ag-app.c
index c3e83b2..e40e567 100644
--- a/src/ag-app.c
+++ b/src/ag-app.c
@@ -257,7 +257,7 @@ setup_menu(AgApp *app)
 
     builder = gtk_builder_new();
 
-    if (!gtk_builder_add_from_resource(builder, "/eu/polonkai/gergely/astrognome/astrognome.ui", &err)) {
+    if (!gtk_builder_add_from_resource(builder, "/eu/polonkai/gergely/Astrognome/ui/astrognome.ui", &err)) {
         g_error("%s", (err) ? err->message : "unknown error");
     }
 
diff --git a/src/ag-preferences.c b/src/ag-preferences.c
index 5615d4a..9fd6b55 100644
--- a/src/ag-preferences.c
+++ b/src/ag-preferences.c
@@ -40,7 +40,7 @@ ag_preferences_class_init(AgPreferencesClass *klass)
     object_class->finalize = ag_preferences_finalize;
     dialog_class->response = ag_preferences_response;
 
-    gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/astrognome/ag-preferences.ui");
+    gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/Astrognome/ui/ag-preferences.ui");
     gtk_widget_class_bind_template_child_private(widget_class, AgPreferences, maximized);
 }
 
diff --git a/src/ag-window.c b/src/ag-window.c
index d5cd5b5..0fa1491 100644
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -540,7 +540,7 @@ ag_window_class_init(AgWindowClass *klass)
 
     gobject_class->dispose = ag_window_dispose;
 
-    gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/astrognome/ag-window.ui");
+    gtk_widget_class_set_template_from_resource(widget_class, "/eu/polonkai/gergely/Astrognome/ui/ag-window.ui");
     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, header_bar);
     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, name);
     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, year);
diff --git a/src/ag.gresource.xml b/src/ag.gresource.xml
index 120a9d7..111d846 100644
--- a/src/ag.gresource.xml
+++ b/src/ag.gresource.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/eu/polonkai/gergely/astrognome">
-    <file>astrognome.ui</file>
-    <file>ag-window.ui</file>
-    <file>ag-preferences.ui</file>
+  <gresource prefix="/eu/polonkai/gergely/Astrognome">
+    <file>ui/astrognome.ui</file>
+    <file>ui/ag-window.ui</file>
+    <file>ui/ag-preferences.ui</file>
   </gresource>
 </gresources>
diff --git a/src/ag-preferences.ui b/src/resources/ui/ag-preferences.ui
similarity index 100%
rename from src/ag-preferences.ui
rename to src/resources/ui/ag-preferences.ui
diff --git a/src/ag-window.ui b/src/resources/ui/ag-window.ui
similarity index 100%
rename from src/ag-window.ui
rename to src/resources/ui/ag-window.ui
diff --git a/src/astrognome.ui b/src/resources/ui/astrognome.ui
similarity index 100%
rename from src/astrognome.ui
rename to src/resources/ui/astrognome.ui