diff --git a/po/POTFILES.in b/po/POTFILES.in
index adf8fa7..b25306d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,11 +2,11 @@ data/remote-viewer.desktop.in
 data/virt-viewer-mime.xml.in
 src/remote-viewer-main.c
 src/remote-viewer.c
-[type: gettext/glade] src/remote-viewer-connect.ui
-[type: gettext/glade] src/virt-viewer-about.ui
+[type: gettext/glade] src/resources/ui/remote-viewer-connect.ui
+[type: gettext/glade] src/resources/ui/virt-viewer-about.ui
 src/virt-viewer-app.c
 src/virt-viewer-auth.c
-[type: gettext/glade] src/virt-viewer-auth.ui
+[type: gettext/glade] src/resources/ui/virt-viewer-auth.ui
 src/virt-viewer-display-vnc.c
 src/virt-viewer-file-transfer-dialog.c
 src/virt-viewer-main.c
@@ -16,7 +16,7 @@ src/virt-viewer-vm-connection.c
 src/virt-viewer-window.c
 src/virt-viewer-file.c
 src/virt-viewer.c
-[type: gettext/glade] src/virt-viewer.ui
-[type: gettext/glade] src/virt-viewer-guest-details.ui
-[type: gettext/glade] src/virt-viewer-vm-connection.ui
-[type: gettext/glade] src/virt-viewer-preferences.ui
+[type: gettext/glade] src/resources/ui/virt-viewer.ui
+[type: gettext/glade] src/resources/ui/virt-viewer-guest-details.ui
+[type: gettext/glade] src/resources/ui/virt-viewer-vm-connection.ui
+[type: gettext/glade] src/resources/ui/virt-viewer-preferences.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index a93c24b..bbabc61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,20 +6,20 @@ bin_PROGRAMS =
 noinst_LTLIBRARIES = libvirt-viewer-util.la libvirt-viewer.la
 
 noinst_DATA = \
-	virt-viewer.ui \
-	virt-viewer-about.ui \
-	virt-viewer-auth.ui \
-	virt-viewer-guest-details.ui \
-	virt-viewer-vm-connection.ui \
-	virt-viewer-preferences.ui \
-	remote-viewer-connect.ui \
+	resources/ui/virt-viewer.ui \
+	resources/ui/virt-viewer-about.ui \
+	resources/ui/virt-viewer-auth.ui \
+	resources/ui/virt-viewer-guest-details.ui \
+	resources/ui/virt-viewer-vm-connection.ui \
+	resources/ui/virt-viewer-preferences.ui \
+	resources/ui/remote-viewer-connect.ui \
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(noinst_DATA)					\
 	virt-viewer-enums.c.etemplate		\
 	virt-viewer-enums.h.etemplate		\
-	virt-viewer.gresource.xml		\
+	resources/virt-viewer.gresource.xml	\
 	$(NULL)
 
 ENUMS_FILES =					\
@@ -33,8 +33,8 @@ BUILT_SOURCES =					\
 	virt-viewer-enums.c			\
 	$(NULL)
 
-virt-viewer-resources.c virt-viewer-resources.h: virt-viewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/virt-viewer.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name virt_viewer $<
+virt-viewer-resources.c virt-viewer-resources.h: resources/virt-viewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/resources $(srcdir)/resources/virt-viewer.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/resources --generate --c-name virt_viewer $<
 
 virt-viewer-enums.c virt-viewer-enums.h: %: %.etemplate $(ENUMS_FILES)
 	$(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \
diff --git a/src/remote-viewer-connect.ui b/src/resources/ui/remote-viewer-connect.ui
similarity index 100%
rename from src/remote-viewer-connect.ui
rename to src/resources/ui/remote-viewer-connect.ui
diff --git a/src/virt-viewer-about.ui b/src/resources/ui/virt-viewer-about.ui
similarity index 100%
rename from src/virt-viewer-about.ui
rename to src/resources/ui/virt-viewer-about.ui
diff --git a/src/virt-viewer-auth.ui b/src/resources/ui/virt-viewer-auth.ui
similarity index 100%
rename from src/virt-viewer-auth.ui
rename to src/resources/ui/virt-viewer-auth.ui
diff --git a/src/virt-viewer-guest-details.ui b/src/resources/ui/virt-viewer-guest-details.ui
similarity index 100%
rename from src/virt-viewer-guest-details.ui
rename to src/resources/ui/virt-viewer-guest-details.ui
diff --git a/src/virt-viewer-preferences.ui b/src/resources/ui/virt-viewer-preferences.ui
similarity index 100%
rename from src/virt-viewer-preferences.ui
rename to src/resources/ui/virt-viewer-preferences.ui
diff --git a/src/virt-viewer-vm-connection.ui b/src/resources/ui/virt-viewer-vm-connection.ui
similarity index 100%
rename from src/virt-viewer-vm-connection.ui
rename to src/resources/ui/virt-viewer-vm-connection.ui
diff --git a/src/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
similarity index 100%
rename from src/virt-viewer.ui
rename to src/resources/ui/virt-viewer.ui
diff --git a/src/resources/virt-viewer.gresource.xml b/src/resources/virt-viewer.gresource.xml
new file mode 100644
index 0000000..b8ced29
--- /dev/null
+++ b/src/resources/virt-viewer.gresource.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/virt-manager/virt-viewer">
+    <file>ui/remote-viewer-connect.ui</file>
+    <file>ui/virt-viewer-about.ui</file>
+    <file>ui/virt-viewer-auth.ui</file>
+    <file>ui/virt-viewer-guest-details.ui</file>
+    <file>ui/virt-viewer-preferences.ui</file>
+    <file>ui/virt-viewer-vm-connection.ui</file>
+    <file>ui/virt-viewer.ui</file>
+    <file alias="icons/16x16/virt-viewer.png">../../icons/16x16/virt-viewer.png</file>
+    <file alias="icons/22x22/virt-viewer.png">../../icons/22x22/virt-viewer.png</file>
+    <file alias="icons/24x24/virt-viewer.png">../../icons/24x24/virt-viewer.png</file>
+    <file alias="icons/24x24/virt-viewer-usb.png">../../icons/24x24/virt-viewer-usb.png</file>
+    <file alias="icons/32x32/virt-viewer.png">../../icons/32x32/virt-viewer.png</file>
+    <file alias="icons/48x48/virt-viewer.png">../../icons/48x48/virt-viewer.png</file>
+    <file alias="icons/256x256/virt-viewer.png">../../icons/256x256/virt-viewer.png</file>
+  </gresource>
+</gresources>
diff --git a/src/virt-viewer-util.h b/src/virt-viewer-util.h
index 5515f66..14a477a 100644
--- a/src/virt-viewer-util.h
+++ b/src/virt-viewer-util.h
@@ -34,7 +34,7 @@ enum {
 };
 
 #define VIRT_VIEWER_ERROR virt_viewer_error_quark ()
-#define VIRT_VIEWER_RESOURCE_PREFIX "/org/virt-manager/virt-viewer"
+#define VIRT_VIEWER_RESOURCE_PREFIX "/org/virt-manager/virt-viewer/ui"
 
 GQuark virt_viewer_error_quark(void);
 
diff --git a/src/virt-viewer.gresource.xml b/src/virt-viewer.gresource.xml
deleted file mode 100644
index 019678f..0000000
--- a/src/virt-viewer.gresource.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/virt-manager/virt-viewer">
-    <file>remote-viewer-connect.ui</file>
-    <file>virt-viewer-about.ui</file>
-    <file>virt-viewer-auth.ui</file>
-    <file>virt-viewer-guest-details.ui</file>
-    <file>virt-viewer-preferences.ui</file>
-    <file>virt-viewer-vm-connection.ui</file>
-    <file>virt-viewer.ui</file>
-    <file alias="icons/16x16/virt-viewer.png">../icons/16x16/virt-viewer.png</file>
-    <file alias="icons/22x22/virt-viewer.png">../icons/22x22/virt-viewer.png</file>
-    <file alias="icons/24x24/virt-viewer.png">../icons/24x24/virt-viewer.png</file>
-    <file alias="icons/24x24/virt-viewer-usb.png">../icons/24x24/virt-viewer-usb.png</file>
-    <file alias="icons/32x32/virt-viewer.png">../icons/32x32/virt-viewer.png</file>
-    <file alias="icons/48x48/virt-viewer.png">../icons/48x48/virt-viewer.png</file>
-    <file alias="icons/256x256/virt-viewer.png">../icons/256x256/virt-viewer.png</file>
-  </gresource>
-</gresources>