diff --git a/Frame 209.png b/Frame 209.png
deleted file mode 100644
index 875e950..0000000
Binary files a/Frame 209.png and /dev/null differ
diff --git a/src/arrow2-top-right-symbolic.svg b/data/icons/arrow2-top-right-symbolic.svg
similarity index 100%
rename from src/arrow2-top-right-symbolic.svg
rename to data/icons/arrow2-top-right-symbolic.svg
diff --git a/src/check-plain-symbolic.svg b/data/icons/check-plain-symbolic.svg
similarity index 100%
rename from src/check-plain-symbolic.svg
rename to data/icons/check-plain-symbolic.svg
diff --git a/src/clock-alt-symbolic.svg b/data/icons/clock-alt-symbolic.svg
similarity index 100%
rename from src/clock-alt-symbolic.svg
rename to data/icons/clock-alt-symbolic.svg
diff --git a/src/error-symbolic.svg b/data/icons/error-symbolic.svg
similarity index 100%
rename from src/error-symbolic.svg
rename to data/icons/error-symbolic.svg
diff --git a/src/flatpak-symbolic.svg b/data/icons/flatpak-symbolic.svg
similarity index 100%
rename from src/flatpak-symbolic.svg
rename to data/icons/flatpak-symbolic.svg
diff --git a/src/folder-visiting-symbolic.svg b/data/icons/folder-visiting-symbolic.svg
similarity index 100%
rename from src/folder-visiting-symbolic.svg
rename to data/icons/folder-visiting-symbolic.svg
diff --git a/src/funnel-symbolic.svg b/data/icons/funnel-symbolic.svg
similarity index 100%
rename from src/funnel-symbolic.svg
rename to data/icons/funnel-symbolic.svg
diff --git a/src/info-symbolic.svg b/data/icons/info-symbolic.svg
similarity index 100%
rename from src/info-symbolic.svg
rename to data/icons/info-symbolic.svg
diff --git a/src/paper-filled-symbolic.svg b/data/icons/paper-filled-symbolic.svg
similarity index 100%
rename from src/paper-filled-symbolic.svg
rename to data/icons/paper-filled-symbolic.svg
diff --git a/src/plus-large-symbolic.svg b/data/icons/plus-large-symbolic.svg
similarity index 100%
rename from src/plus-large-symbolic.svg
rename to data/icons/plus-large-symbolic.svg
diff --git a/src/right-large-symbolic.svg b/data/icons/right-large-symbolic.svg
similarity index 100%
rename from src/right-large-symbolic.svg
rename to data/icons/right-large-symbolic.svg
diff --git a/src/selection-mode-symbolic.svg b/data/icons/selection-mode-symbolic.svg
similarity index 100%
rename from src/selection-mode-symbolic.svg
rename to data/icons/selection-mode-symbolic.svg
diff --git a/src/software-update-available-symbolic.svg b/data/icons/software-update-available-symbolic.svg
similarity index 100%
rename from src/software-update-available-symbolic.svg
rename to data/icons/software-update-available-symbolic.svg
diff --git a/src/software-update-urgent-symbolic.svg b/data/icons/software-update-urgent-symbolic.svg
similarity index 100%
rename from src/software-update-urgent-symbolic.svg
rename to data/icons/software-update-urgent-symbolic.svg
diff --git a/src/tab-new-symbolic.svg b/data/icons/tab-new-symbolic.svg
similarity index 100%
rename from src/tab-new-symbolic.svg
rename to data/icons/tab-new-symbolic.svg
diff --git a/src/user-trash-symbolic.svg b/data/icons/user-trash-symbolic.svg
similarity index 100%
rename from src/user-trash-symbolic.svg
rename to data/icons/user-trash-symbolic.svg
diff --git a/src/view-more-symbolic.svg b/data/icons/view-more-symbolic.svg
similarity index 100%
rename from src/view-more-symbolic.svg
rename to data/icons/view-more-symbolic.svg
diff --git a/src/style.css b/data/style.css
similarity index 100%
rename from src/style.css
rename to data/style.css
diff --git a/src/downgrade.blp b/data/ui/downgrade.blp
similarity index 100%
rename from src/downgrade.blp
rename to data/ui/downgrade.blp
diff --git a/src/filter.blp b/data/ui/filter.blp
similarity index 100%
rename from src/filter.blp
rename to data/ui/filter.blp
diff --git a/src/orphans.blp b/data/ui/orphans.blp
similarity index 100%
rename from src/orphans.blp
rename to data/ui/orphans.blp
diff --git a/src/popular_remotes.blp b/data/ui/popular_remotes.blp
similarity index 100%
rename from src/popular_remotes.blp
rename to data/ui/popular_remotes.blp
diff --git a/src/properties.blp b/data/ui/properties.blp
similarity index 100%
rename from src/properties.blp
rename to data/ui/properties.blp
diff --git a/src/remotes.blp b/data/ui/remotes.blp
similarity index 100%
rename from src/remotes.blp
rename to data/ui/remotes.blp
diff --git a/src/search_install.blp b/data/ui/search_install.blp
similarity index 100%
rename from src/search_install.blp
rename to data/ui/search_install.blp
diff --git a/src/snapshots.blp b/data/ui/snapshots.blp
similarity index 100%
rename from src/snapshots.blp
rename to data/ui/snapshots.blp
diff --git a/src/window.blp b/data/ui/window.blp
similarity index 95%
rename from src/window.blp
rename to data/ui/window.blp
index c2aa0cb..bd197b4 100644
--- a/src/window.blp
+++ b/data/ui/window.blp
@@ -104,11 +104,7 @@ template $WarehouseWindow: Adw.ApplicationWindow {
 
             Label {
               label: _("This could take a while.");
-
-              styles [
-                "description",
-                "body"
-              ]
+              styles ["description", "body"]
             }
           }
 
@@ -130,20 +126,12 @@ template $WarehouseWindow: Adw.ApplicationWindow {
 
             Label {
               label: _("Uninstalling…");
-
-              styles [
-                "title-1",
-                "title"
-              ]
+              styles ["title-1", "title"]
             }
 
             Label {
               label: _("This could take a while.");
-
-              styles [
-                "description",
-                "body"
-              ]
+              styles ["description", "body"]
             }
           }
 
diff --git a/src/const.py.in b/src/const.py.in
index 1f7da55..2974ba1 100644
--- a/src/const.py.in
+++ b/src/const.py.in
@@ -1,5 +1,5 @@
 #!@PYTHON@
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-only
 
 class Config:
     DEVEL = '@DEVEL@' == 'Development'
diff --git a/src/downgrade_window.py b/src/downgrade_window.py
index 0fc8d87..dba9609 100644
--- a/src/downgrade_window.py
+++ b/src/downgrade_window.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import pathlib
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/downgrade.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/downgrade.ui")
 class DowngradeWindow(Adw.Window):
     __gtype_name__ = "DowngradeWindow"
     
diff --git a/src/filter_window.py b/src/filter_window.py
index 74da607..5836d01 100644
--- a/src/filter_window.py
+++ b/src/filter_window.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import pathlib
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/filter.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/filter.ui")
 class FilterWindow(Adw.Window):
     __gtype_name__ = "FilterWindow"
 
diff --git a/src/meson.build b/src/meson.build
index cb76511..ec066d3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,15 +5,15 @@ gnome = import('gnome')
 blueprints = custom_target('blueprints',
   input: files(
     'gtk/help-overlay.blp',
-    'window.blp',
-    'orphans.blp',
-    'filter.blp',
-    'popular_remotes.blp',
-    'remotes.blp',
-    'downgrade.blp',
-    'search_install.blp',
-    'snapshots.blp',
-    'properties.blp',
+    '../data/ui/window.blp',
+    '../data/ui/orphans.blp',
+    '../data/ui/filter.blp',
+    '../data/ui/popular_remotes.blp',
+    '../data/ui/remotes.blp',
+    '../data/ui/downgrade.blp',
+    '../data/ui/search_install.blp',
+    '../data/ui/snapshots.blp',
+    '../data/ui/properties.blp',
   ),
   output: '.',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
@@ -55,25 +55,32 @@ configure_file(
 warehouse_sources = [
   '__init__.py',
   'main.py',
-  'window.py',
-  'properties_window.py',
-  'orphans_window.py',
-  'remotes_window.py',
   'common.py',
-  'orphans.blp',
-  'filter_window.py',
-  'filter.blp',
+  'window.py',
   'popular_remotes_window.py',
-  'style.css',
-  'remotes.blp',
-  'downgrade_window.py',
-  'downgrade.blp',
-  'search_install.blp',
-  'search_install_window.py',
-  'snapshots_window.py',
-  'snapshots.blp',
   'app_row_widget.py',
-  'properties.blp',
+  '../data/style.css',
+  
+  'properties_window.py',
+  '../data/ui/properties.blp',
+  
+  'orphans_window.py',
+  '../data/ui/orphans.blp',
+  
+  'remotes_window.py',
+  '../data/ui/remotes.blp',
+  
+  'filter_window.py',
+  '../data/ui/filter.blp',
+  
+  'downgrade_window.py',
+  '../data/ui/downgrade.blp',
+  
+  'search_install_window.py',
+  '../data/ui/search_install.blp',
+  
+  'snapshots_window.py',
+  '../data/ui/snapshots.blp',
 ]
 
 configure_file(
diff --git a/src/orphans_window.py b/src/orphans_window.py
index 35b485c..a9e783c 100644
--- a/src/orphans_window.py
+++ b/src/orphans_window.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import pathlib
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/orphans.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/orphans.ui")
 class OrphansWindow(Adw.Window):
     __gtype_name__ = "OrphansWindow"
 
diff --git a/src/popular_remotes_window.py b/src/popular_remotes_window.py
index 5d85d17..3429f06 100644
--- a/src/popular_remotes_window.py
+++ b/src/popular_remotes_window.py
@@ -5,7 +5,7 @@ import os
 import pathlib
 import re
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/popular_remotes.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/popular_remotes.ui")
 class PopularRemotesWindow(Adw.Window):
     __gtype_name__ = "PopularRemotesWindow"
 
diff --git a/src/properties_window.py b/src/properties_window.py
index c5306fb..b9f42a1 100644
--- a/src/properties_window.py
+++ b/src/properties_window.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import pathlib
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/properties.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/properties.ui")
 class PropertiesWindow(Adw.Window):
     __gtype_name__ = "PropertiesWindow"
     
diff --git a/src/remotes_window.py b/src/remotes_window.py
index 7bb4317..eb248be 100644
--- a/src/remotes_window.py
+++ b/src/remotes_window.py
@@ -5,7 +5,7 @@ import subprocess
 import os
 import re
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/remotes.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/remotes.ui")
 class RemotesWindow(Adw.Window):
     __gtype_name__ = "RemotesWindow"
 
diff --git a/src/search_install_window.py b/src/search_install_window.py
index 1f78659..cf9f9d5 100644
--- a/src/search_install_window.py
+++ b/src/search_install_window.py
@@ -4,7 +4,7 @@ import subprocess
 import os
 import pathlib
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/search_install.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/search_install.ui")
 class SearchInstallWindow (Adw.Window): # TODO: stop execution of thread when search is changed
     __gtype_name__ = "SearchInstallWindow"
 
diff --git a/src/snapshots_window.py b/src/snapshots_window.py
index fe0550e..816a379 100644
--- a/src/snapshots_window.py
+++ b/src/snapshots_window.py
@@ -5,7 +5,7 @@ import os
 import pathlib
 import time
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshots.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/snapshots.ui")
 class SnapshotsWindow(Adw.Window):
     __gtype_name__ = "SnapshotsWindow"
     
diff --git a/src/warehouse.gresource.xml b/src/warehouse.gresource.xml
index 02c2dc7..71c6b91 100644
--- a/src/warehouse.gresource.xml
+++ b/src/warehouse.gresource.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/github/flattool/Warehouse">
-    <file preprocess="xml-stripblanks">window.ui</file>
-    <file preprocess="xml-stripblanks">orphans.ui</file>
-    <file preprocess="xml-stripblanks">filter.ui</file>
-    <file preprocess="xml-stripblanks">popular_remotes.ui</file>
-    <file preprocess="xml-stripblanks">remotes.ui</file>
-    <file preprocess="xml-stripblanks">downgrade.ui</file>
-    <file preprocess="xml-stripblanks">search_install.ui</file>
-    <file preprocess="xml-stripblanks">snapshots.ui</file>
-    <file preprocess="xml-stripblanks">properties.ui</file>
-    <file>style.css</file>
+    <file preprocess="xml-stripblanks">../data/ui/window.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/orphans.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/filter.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/popular_remotes.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/remotes.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/downgrade.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/search_install.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/snapshots.ui</file>
+    <file preprocess="xml-stripblanks">../data/ui/properties.ui</file>
+    <file>../data/style.css</file>
     <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
     <!-- <file preprocess="xml-stripblanks">../data/io.github.flattool.Warehouse.metainfo.xml.in</file> -->
   </gresource>
   <gresource prefix="/io/github/flattool/Warehouse/icons/scalable/actions/">
-    <file preprocess="xml-stripblanks">selection-mode-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">error-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">user-trash-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">folder-visiting-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">info-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">check-plain-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">paper-filled-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">plus-large-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">funnel-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">flatpak-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">right-large-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">view-more-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">clock-alt-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">arrow2-top-right-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">software-update-available-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">software-update-urgent-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="selection-mode-symbolic.svg">../data/icons/selection-mode-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="error-symbolic.svg">../data/icons/error-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="user-trash-symbolic.svg">../data/icons/user-trash-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="folder-visiting-symbolic.svg">../data/icons/folder-visiting-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="info-symbolic.svg">../data/icons/info-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="check-plain-symbolic.svg">../data/icons/check-plain-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="paper-filled-symbolic.svg">../data/icons/paper-filled-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="plus-large-symbolic.svg">../data/icons/plus-large-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="funnel-symbolic.svg">../data/icons/funnel-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="flatpak-symbolic.svg">../data/icons/flatpak-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="right-large-symbolic.svg">../data/icons/right-large-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="view-more-symbolic.svg">../data/icons/view-more-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="clock-alt-symbolic.svg">../data/icons/clock-alt-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="arrow2-top-right-symbolic.svg">../data/icons/arrow2-top-right-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="software-update-available-symbolic.svg">../data/icons/software-update-available-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="software-update-urgent-symbolic.svg">../data/icons/software-update-urgent-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/src/window.py b/src/window.py
index 265b98f..8c14649 100644
--- a/src/window.py
+++ b/src/window.py
@@ -32,7 +32,7 @@ from .const import Config
 
 from .app_row_widget import AppRow
 
-@Gtk.Template(resource_path="/io/github/flattool/Warehouse/window.ui")
+@Gtk.Template(resource_path="/io/github/flattool/Warehouse/../data/ui/window.ui")
 class WarehouseWindow(Adw.ApplicationWindow):
     __gtype_name__ = "WarehouseWindow"
     main_window_title = "Warehouse"