45 files changed, 82 insertions, 79 deletions
diff --git a/data/meson.build b/data/meson.build
index 926b3aab..ad9aa248 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,34 +1,13 @@
 # Compiling the resources
-VCS_TAG = ''
-if get_option('profile') != 'default'
-  git = find_program('git', required : false)
-  if git.found()
-    VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
-  endif
-  if VCS_TAG == ''
-    VCS_TAG = '-devel'
-  else
-    VCS_TAG = '-@0@'.format(VCS_TAG)
-  endif
-endif
-about_dialog_conf = configuration_data()
-about_dialog_conf.set('PACKAGE_VERSION', '@0@@1@'.format(meson.project_version(), VCS_TAG))
-about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
-about_dialog_conf.set('PROGRAM_NAME', 'Music' + NAME_SUFFIX)
-about_dialog_conf.set('APPID', APPLICATION_ID)
-
+# about_dialog is defined in data/ui/meson.build to generate the output file in that directory
 gnome.compile_resources(
   PROJECT_RDNN_NAME,
   PROJECT_RDNN_NAME + '.gresource.xml',
   gresource_bundle: true,
-  source_dir: '.',
+  source_dir: meson.current_build_dir(),
   install_dir: PKGDATA_DIR,
   install: true,
-  dependencies: configure_file(
-    input: 'AboutDialog.ui.in',
-    output: 'AboutDialog.ui',
-    configuration: about_dialog_conf
-  )
+  dependencies: about_dialog
 )
 
 # Installing the schema file
diff --git a/data/org.gnome.Music.gresource.xml b/data/org.gnome.Music.gresource.xml
index d2c31943..5cec6aec 100644
--- a/data/org.gnome.Music.gresource.xml
+++ b/data/org.gnome.Music.gresource.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/Music">
-    <file preprocess="xml-stripblanks">AboutDialog.ui</file>
-    <file alias="gtk/menus.ui" preprocess="xml-stripblanks">app-menu.ui</file>
-    <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">help-overlay.ui</file>
+    <file alias="gtk/menus.ui" preprocess="xml-stripblanks">ui/app-menu.ui</file>
+    <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
     <file>application.css</file>
     <file>initial-state.png</file>
-    <file preprocess="xml-stripblanks">AlbumCover.ui</file>
-    <file preprocess="xml-stripblanks">AlbumWidget.ui</file>
-    <file preprocess="xml-stripblanks">ArtistAlbumWidget.ui</file>
-    <file preprocess="xml-stripblanks">ArtistAlbumsWidget.ui</file>
-    <file preprocess="xml-stripblanks">DiscBox.ui</file>
-    <file preprocess="xml-stripblanks">DropDown.ui</file>
-    <file preprocess="xml-stripblanks">EmptyView.ui</file>
-    <file preprocess="xml-stripblanks">FilterView.ui</file>
-    <file preprocess="xml-stripblanks">PlayerToolbar.ui</file>
-    <file preprocess="xml-stripblanks">Searchbar.ui</file>
-    <file preprocess="xml-stripblanks">SelectionBarMenuButton.ui</file>
-    <file preprocess="xml-stripblanks">SelectionToolbar.ui</file>
-    <file preprocess="xml-stripblanks">SidebarRow.ui</file>
-    <file preprocess="xml-stripblanks">SongWidget.ui</file>
-    <file preprocess="xml-stripblanks">HeaderBar.ui</file>
-    <file preprocess="xml-stripblanks">PlaylistContextMenu.ui</file>
-    <file preprocess="xml-stripblanks">PlaylistControls.ui</file>
-    <file preprocess="xml-stripblanks">PlaylistDialog.ui</file>
-    <file preprocess="xml-stripblanks">TwoLineTip.ui</file>
+    <file preprocess="xml-stripblanks">ui/AboutDialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/AlbumCover.ui</file>
+    <file preprocess="xml-stripblanks">ui/AlbumWidget.ui</file>
+    <file preprocess="xml-stripblanks">ui/ArtistAlbumWidget.ui</file>
+    <file preprocess="xml-stripblanks">ui/ArtistAlbumsWidget.ui</file>
+    <file preprocess="xml-stripblanks">ui/DiscBox.ui</file>
+    <file preprocess="xml-stripblanks">ui/DropDown.ui</file>
+    <file preprocess="xml-stripblanks">ui/EmptyView.ui</file>
+    <file preprocess="xml-stripblanks">ui/FilterView.ui</file>
+    <file preprocess="xml-stripblanks">ui/HeaderBar.ui</file>
+    <file preprocess="xml-stripblanks">ui/PlayerToolbar.ui</file>
+    <file preprocess="xml-stripblanks">ui/PlaylistContextMenu.ui</file>
+    <file preprocess="xml-stripblanks">ui/PlaylistControls.ui</file>
+    <file preprocess="xml-stripblanks">ui/PlaylistDialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/Searchbar.ui</file>
+    <file preprocess="xml-stripblanks">ui/SelectionBarMenuButton.ui</file>
+    <file preprocess="xml-stripblanks">ui/SelectionToolbar.ui</file>
+    <file preprocess="xml-stripblanks">ui/SidebarRow.ui</file>
+    <file preprocess="xml-stripblanks">ui/SongWidget.ui</file>
+    <file preprocess="xml-stripblanks">ui/TwoLineTip.ui</file>
   </gresource>
 </gresources>
diff --git a/data/AboutDialog.ui.in b/data/ui/AboutDialog.ui.in
index 4b363623..4b363623 100644
--- a/data/AboutDialog.ui.in
+++ b/data/ui/AboutDialog.ui.in
diff --git a/data/AlbumCover.ui b/data/ui/AlbumCover.ui
index 46d21b3c..46d21b3c 100644
--- a/data/AlbumCover.ui
+++ b/data/ui/AlbumCover.ui
diff --git a/data/AlbumWidget.ui b/data/ui/AlbumWidget.ui
index cf19f250..cf19f250 100644
--- a/data/AlbumWidget.ui
+++ b/data/ui/AlbumWidget.ui
diff --git a/data/ArtistAlbumWidget.ui b/data/ui/ArtistAlbumWidget.ui
index fffc703e..fffc703e 100644
--- a/data/ArtistAlbumWidget.ui
+++ b/data/ui/ArtistAlbumWidget.ui
diff --git a/data/ArtistAlbumsWidget.ui b/data/ui/ArtistAlbumsWidget.ui
index c3bfa5d7..c3bfa5d7 100644
--- a/data/ArtistAlbumsWidget.ui
+++ b/data/ui/ArtistAlbumsWidget.ui
diff --git a/data/DiscBox.ui b/data/ui/DiscBox.ui
index c869d46a..c869d46a 100644
--- a/data/DiscBox.ui
+++ b/data/ui/DiscBox.ui
diff --git a/data/DropDown.ui b/data/ui/DropDown.ui
index fd4bffe3..fd4bffe3 100644
--- a/data/DropDown.ui
+++ b/data/ui/DropDown.ui
diff --git a/data/EmptyView.ui b/data/ui/EmptyView.ui
index c500348f..c500348f 100644
--- a/data/EmptyView.ui
+++ b/data/ui/EmptyView.ui
diff --git a/data/FilterView.ui b/data/ui/FilterView.ui
index 36816ae8..36816ae8 100644
--- a/data/FilterView.ui
+++ b/data/ui/FilterView.ui
diff --git a/data/HeaderBar.ui b/data/ui/HeaderBar.ui
index d2dd7926..d2dd7926 100644
--- a/data/HeaderBar.ui
+++ b/data/ui/HeaderBar.ui
diff --git a/data/PlayerToolbar.ui b/data/ui/PlayerToolbar.ui
index 58bff15b..58bff15b 100644
--- a/data/PlayerToolbar.ui
+++ b/data/ui/PlayerToolbar.ui
diff --git a/data/PlaylistContextMenu.ui b/data/ui/PlaylistContextMenu.ui
index 985daee3..985daee3 100644
--- a/data/PlaylistContextMenu.ui
+++ b/data/ui/PlaylistContextMenu.ui
diff --git a/data/PlaylistControls.ui b/data/ui/PlaylistControls.ui
index 64456fdd..64456fdd 100644
--- a/data/PlaylistControls.ui
+++ b/data/ui/PlaylistControls.ui
diff --git a/data/PlaylistDialog.ui b/data/ui/PlaylistDialog.ui
index d31c073a..d31c073a 100644
--- a/data/PlaylistDialog.ui
+++ b/data/ui/PlaylistDialog.ui
diff --git a/data/Searchbar.ui b/data/ui/Searchbar.ui
index 981f486f..981f486f 100644
--- a/data/Searchbar.ui
+++ b/data/ui/Searchbar.ui
diff --git a/data/SelectionBarMenuButton.ui b/data/ui/SelectionBarMenuButton.ui
index b2bde8b2..b2bde8b2 100644
--- a/data/SelectionBarMenuButton.ui
+++ b/data/ui/SelectionBarMenuButton.ui
diff --git a/data/SelectionToolbar.ui b/data/ui/SelectionToolbar.ui
index ec64876c..ec64876c 100644
--- a/data/SelectionToolbar.ui
+++ b/data/ui/SelectionToolbar.ui
diff --git a/data/SidebarRow.ui b/data/ui/SidebarRow.ui
index 040ae153..040ae153 100644
--- a/data/SidebarRow.ui
+++ b/data/ui/SidebarRow.ui
diff --git a/data/SongWidget.ui b/data/ui/SongWidget.ui
index c8837536..c8837536 100644
--- a/data/SongWidget.ui
+++ b/data/ui/SongWidget.ui
diff --git a/data/TwoLineTip.ui b/data/ui/TwoLineTip.ui
index 588abc3f..588abc3f 100644
--- a/data/TwoLineTip.ui
+++ b/data/ui/TwoLineTip.ui
diff --git a/data/app-menu.ui b/data/ui/app-menu.ui
index cf12e41d..cf12e41d 100644
--- a/data/app-menu.ui
+++ b/data/ui/app-menu.ui
diff --git a/data/help-overlay.ui b/data/ui/help-overlay.ui
index ebddf7c4..ebddf7c4 100644
--- a/data/help-overlay.ui
+++ b/data/ui/help-overlay.ui
diff --git a/data/ui/meson.build b/data/ui/meson.build
new file mode 100644
index 00000000..73d1f554
--- /dev/null
+++ b/data/ui/meson.build
@@ -0,0 +1,24 @@
+# AboutDialog.ui configuration
+VCS_TAG = ''
+if get_option('profile') != 'default'
+  git = find_program('git', required : false)
+  if git.found()
+    VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+  endif
+  if VCS_TAG == ''
+    VCS_TAG = '-devel'
+  else
+    VCS_TAG = '-@0@'.format(VCS_TAG)
+  endif
+endif
+about_dialog_conf = configuration_data()
+about_dialog_conf.set('PACKAGE_VERSION', '@0@@1@'.format(meson.project_version(), VCS_TAG))
+about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
+about_dialog_conf.set('PROGRAM_NAME', 'Music' + NAME_SUFFIX)
+about_dialog_conf.set('APPID', APPLICATION_ID)
+
+about_dialog = configure_file(
+  input: 'AboutDialog.ui.in',
+  output: 'AboutDialog.ui',
+  configuration: about_dialog_conf
+)
+\ No newline at end of file
diff --git a/gnomemusic/views/emptyview.py b/gnomemusic/views/emptyview.py
index 1ea8279b..91638c45 100644
--- a/gnomemusic/views/emptyview.py
+++ b/gnomemusic/views/emptyview.py
@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art
 from gnomemusic.query import Query
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/EmptyView.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/EmptyView.ui")
 class EmptyView(Gtk.Stack):
     """Empty view when there is no music to display
 
diff --git a/gnomemusic/widgets/aboutdialog.py b/gnomemusic/widgets/aboutdialog.py
index 92976ba7..6cd4e8d6 100644
--- a/gnomemusic/widgets/aboutdialog.py
+++ b/gnomemusic/widgets/aboutdialog.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/AboutDialog.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/AboutDialog.ui')
 class AboutDialog(Gtk.AboutDialog):
     """About dialog"""
 
diff --git a/gnomemusic/widgets/albumcover.py b/gnomemusic/widgets/albumcover.py
index f8fcd822..e78e2694 100644
--- a/gnomemusic/widgets/albumcover.py
+++ b/gnomemusic/widgets/albumcover.py
@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art
 from gnomemusic.widgets.twolinetip import TwoLineTip
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/AlbumCover.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/AlbumCover.ui')
 class AlbumCover(Gtk.FlowBoxChild):
     """Cover tile as used in AlbumsView
 
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index adad88b5..190e1c70 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -35,7 +35,7 @@ from gnomemusic.widgets.songwidget import SongWidget
 import gnomemusic.utils as utils
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/AlbumWidget.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/AlbumWidget.ui')
 class AlbumWidget(Gtk.EventBox):
     """Album widget.
 
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index b8a2b1d0..02445b34 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -34,7 +34,7 @@ from gnomemusic.widgets.songwidget import SongWidget
 logger = logging.getLogger(__name__)
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/ArtistAlbumsWidget.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/ArtistAlbumsWidget.ui')
 class ArtistAlbumsWidget(Gtk.Box):
     """Widget containing all albums by an artist
 
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index 82dfa619..2aa59fde 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -32,7 +32,7 @@ from gnomemusic.widgets.disclistboxwidget import DiscBox
 import gnomemusic.utils as utils
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/ArtistAlbumWidget.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/ArtistAlbumWidget.ui')
 class ArtistAlbumWidget(Gtk.Box):
 
     __gtype_name__ = 'ArtistAlbumWidget'
diff --git a/gnomemusic/widgets/disclistboxwidget.py b/gnomemusic/widgets/disclistboxwidget.py
index f427d2c7..d839eae2 100644
--- a/gnomemusic/widgets/disclistboxwidget.py
+++ b/gnomemusic/widgets/disclistboxwidget.py
@@ -82,7 +82,7 @@ class DiscSongsFlowBox(Gtk.FlowBox):
         self.props.min_children_per_line = max_per_line
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/DiscBox.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/DiscBox.ui')
 class DiscBox(Gtk.Box):
     """A widget which compromises one disc
 
diff --git a/gnomemusic/widgets/headerbar.py b/gnomemusic/widgets/headerbar.py
index 5772fb3b..fd66782f 100644
--- a/gnomemusic/widgets/headerbar.py
+++ b/gnomemusic/widgets/headerbar.py
@@ -30,7 +30,7 @@ from gi.repository import GObject, Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/SelectionBarMenuButton.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/SelectionBarMenuButton.ui")
 class SelectionBarMenuButton(Gtk.MenuButton):
     """Button for popup to select all or no items
 
@@ -74,7 +74,7 @@ class SelectionBarMenuButton(Gtk.MenuButton):
             self._menu_label.props.label = _("Click on items to select them")
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/HeaderBar.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/HeaderBar.ui")
 class HeaderBar(Gtk.HeaderBar):
     """Headerbar of the application"""
 
diff --git a/gnomemusic/widgets/playertoolbar.py b/gnomemusic/widgets/playertoolbar.py
index 9878436d..78917de9 100644
--- a/gnomemusic/widgets/playertoolbar.py
+++ b/gnomemusic/widgets/playertoolbar.py
@@ -35,7 +35,7 @@ from gnomemusic.widgets.twolinetip import TwoLineTip
 import gnomemusic.utils as utils
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/PlayerToolbar.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/PlayerToolbar.ui')
 class PlayerToolbar(Gtk.ActionBar):
     """Main Player widget object
 
diff --git a/gnomemusic/widgets/playlistcontextmenu.py b/gnomemusic/widgets/playlistcontextmenu.py
index dfab7b9a..5e52b591 100644
--- a/gnomemusic/widgets/playlistcontextmenu.py
+++ b/gnomemusic/widgets/playlistcontextmenu.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/PlaylistContextMenu.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/PlaylistContextMenu.ui')
 class PlaylistContextMenu(Gtk.Popover):
 
     __gtype_name__ = 'PlaylistContextMenu'
diff --git a/gnomemusic/widgets/playlistcontrols.py b/gnomemusic/widgets/playlistcontrols.py
index 098257b0..cb2cd953 100644
--- a/gnomemusic/widgets/playlistcontrols.py
+++ b/gnomemusic/widgets/playlistcontrols.py
@@ -30,7 +30,7 @@ from gnomemusic import log
 import gnomemusic.utils as utils
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/PlaylistControls.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/PlaylistControls.ui')
 class PlaylistControls(Gtk.Grid):
     """Widget holding the playlist controls"""
 
diff --git a/gnomemusic/widgets/playlistdialog.py b/gnomemusic/widgets/playlistdialog.py
index be7f93a6..3b77abae 100644
--- a/gnomemusic/widgets/playlistdialog.py
+++ b/gnomemusic/widgets/playlistdialog.py
@@ -30,7 +30,7 @@ from gnomemusic.playlists import Playlists
 import gnomemusic.utils as utils
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/PlaylistDialog.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/PlaylistDialog.ui")
 class PlaylistDialog(Gtk.Dialog):
     """Dialog for adding items to a playlist"""
 
diff --git a/gnomemusic/widgets/searchbar.py b/gnomemusic/widgets/searchbar.py
index 95fb7758..354b3ff9 100644
--- a/gnomemusic/widgets/searchbar.py
+++ b/gnomemusic/widgets/searchbar.py
@@ -160,7 +160,7 @@ class SourceManager(BaseManager):
         grilo.search_source = src
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/FilterView.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/FilterView.ui")
 class FilterView(Gtk.TreeView):
     """TreeView for search entry items
 
@@ -254,7 +254,7 @@ class FilterView(Gtk.TreeView):
         self.props.manager.entry.emit('changed')
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/DropDown.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/DropDown.ui")
 class DropDown(Gtk.Revealer):
     """Dropdown source/option selection widget for search
 
@@ -314,7 +314,7 @@ class DropDown(Gtk.Revealer):
         return grilo_id == "grl-tracker-source"
 
 
-@Gtk.Template(resource_path="/org/gnome/Music/Searchbar.ui")
+@Gtk.Template(resource_path="/org/gnome/Music/ui/Searchbar.ui")
 class Searchbar(Gtk.SearchBar):
     """Widget containing the search entry
     """
diff --git a/gnomemusic/widgets/selectiontoolbar.py b/gnomemusic/widgets/selectiontoolbar.py
index 84021e85..1d2b775a 100644
--- a/gnomemusic/widgets/selectiontoolbar.py
+++ b/gnomemusic/widgets/selectiontoolbar.py
@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/SelectionToolbar.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/SelectionToolbar.ui')
 class SelectionToolbar(Gtk.ActionBar):
 
     __gtype_name__ = 'SelectionToolbar'
diff --git a/gnomemusic/widgets/sidebarrow.py b/gnomemusic/widgets/sidebarrow.py
index 2466f518..798faaf2 100644
--- a/gnomemusic/widgets/sidebarrow.py
+++ b/gnomemusic/widgets/sidebarrow.py
@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/SidebarRow.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/SidebarRow.ui')
 class SidebarRow(Gtk.ListBoxRow):
     """Row for sidebars
 
diff --git a/gnomemusic/widgets/songwidget.py b/gnomemusic/widgets/songwidget.py
index aa0dd4a8..75bcaaa7 100644
--- a/gnomemusic/widgets/songwidget.py
+++ b/gnomemusic/widgets/songwidget.py
@@ -36,7 +36,7 @@ from gnomemusic.playlists import Playlists, StaticPlaylists
 from gnomemusic.widgets.starimage import StarImage  # noqa: F401
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/SongWidget.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/SongWidget.ui')
 class SongWidget(Gtk.EventBox):
     """The single song widget used in DiscListBox
 
diff --git a/gnomemusic/widgets/twolinetip.py b/gnomemusic/widgets/twolinetip.py
index 3118e934..867105c4 100644
--- a/gnomemusic/widgets/twolinetip.py
+++ b/gnomemusic/widgets/twolinetip.py
@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
 from gnomemusic import log
 
 
-@Gtk.Template(resource_path='/org/gnome/Music/TwoLineTip.ui')
+@Gtk.Template(resource_path='/org/gnome/Music/ui/TwoLineTip.ui')
 class TwoLineTip(Gtk.Box):
     """Tooltip with two lines of text
 
diff --git a/meson.build b/meson.build
index e7c1c6b7..ae574913 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,7 @@ subproject('libgd',
         'pkglibdir=' + PKGLIB_DIR
     ])
 
+subdir('data/ui')
 subdir('data')
 subdir('help')
 subdir('po')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ae21f58..c2365af0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,14 +30,14 @@ gnomemusic/widgets/playlistdialog.py
 gnomemusic/widgets/searchbar.py
 gnomemusic/widgets/starhandlerwidget.py
 gnomemusic/window.py
-data/AboutDialog.ui.in
-data/AlbumWidget.ui
-data/app-menu.ui
-data/HeaderBar.ui
-data/help-overlay.ui
-data/PlayerToolbar.ui
-data/PlaylistContextMenu.ui
-data/PlaylistControls.ui
-data/PlaylistDialog.ui
-data/SelectionBarMenuButton.ui
-data/SelectionToolbar.ui
+data/ui/AboutDialog.ui.in
+data/ui/AlbumWidget.ui
+data/ui/app-menu.ui
+data/ui/HeaderBar.ui
+data/ui/help-overlay.ui
+data/ui/PlayerToolbar.ui
+data/ui/PlaylistContextMenu.ui
+data/ui/PlaylistControls.ui
+data/ui/PlaylistDialog.ui
+data/ui/SelectionBarMenuButton.ui
+data/ui/SelectionToolbar.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5e4f026b..72df75eb 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,4 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/AboutDialog.ui
+data/ui/AboutDialog.ui
 data/org.gnome.Music.appdata.xml
-sub/data/AboutDialog.ui