diff --git a/src/schemas/org.gnome.shell.extensions.top-bar-organizer.gschema.xml b/data/org.gnome.shell.extensions.top-bar-organizer.gschema.xml
similarity index 100%
rename from src/schemas/org.gnome.shell.extensions.top-bar-organizer.gschema.xml
rename to data/org.gnome.shell.extensions.top-bar-organizer.gschema.xml
diff --git a/src/prefs-box-order-item-row.ui b/data/ui/prefs-box-order-item-row.ui
similarity index 100%
rename from src/prefs-box-order-item-row.ui
rename to data/ui/prefs-box-order-item-row.ui
diff --git a/src/prefs-box-order-list-box.ui b/data/ui/prefs-box-order-list-box.ui
similarity index 100%
rename from src/prefs-box-order-list-box.ui
rename to data/ui/prefs-box-order-list-box.ui
diff --git a/src/prefs-box-order-list-empty-placeholder.ui b/data/ui/prefs-box-order-list-empty-placeholder.ui
similarity index 100%
rename from src/prefs-box-order-list-empty-placeholder.ui
rename to data/ui/prefs-box-order-list-empty-placeholder.ui
diff --git a/src/prefs-page.ui b/data/ui/prefs-page.ui
similarity index 100%
rename from src/prefs-page.ui
rename to data/ui/prefs-page.ui
diff --git a/package.sh b/package.sh
index 857c266..7c9739d 100755
--- a/package.sh
+++ b/package.sh
@@ -8,7 +8,5 @@ gnome-extensions pack "$REAL_BASE_DIR/src" \
     --force \
     --extra-source extensionModules \
     --extra-source prefsModules \
-    --extra-source prefs-box-order-item-row.ui \
-    --extra-source prefs-box-order-list-box.ui \
-    --extra-source prefs-box-order-list-empty-placeholder.ui \
-    --extra-source prefs-page.ui \
+    --extra-source ../data/ui \
+    --schema ../data/org.gnome.shell.extensions.top-bar-organizer.gschema.xml
diff --git a/src/prefs.js b/src/prefs.js
index 531397d..5874afe 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -15,7 +15,7 @@ const ScrollManager = Me.imports.prefsModules.ScrollManager;
 
 var PrefsPage = GObject.registerClass({
     GTypeName: "PrefsPage",
-    Template: Me.dir.get_child("prefs-page.ui").get_uri(),
+    Template: Me.dir.get_child("ui").get_child("prefs-page.ui").get_uri(),
     InternalChildren: [
         "left-box",
         "center-box",
diff --git a/src/prefsModules/PrefsBoxOrderItemRow.js b/src/prefsModules/PrefsBoxOrderItemRow.js
index 76fa9f8..0f47ac0 100644
--- a/src/prefsModules/PrefsBoxOrderItemRow.js
+++ b/src/prefsModules/PrefsBoxOrderItemRow.js
@@ -12,7 +12,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 
 var PrefsBoxOrderItemRow = GObject.registerClass({
     GTypeName: "PrefsBoxOrderItemRow",
-    Template: Me.dir.get_child("prefs-box-order-item-row.ui").get_uri(),
+    Template: Me.dir.get_child("ui").get_child("prefs-box-order-item-row.ui").get_uri(),
     InternalChildren: [
         "item-name-display-label",
         "menu-button"
diff --git a/src/prefsModules/PrefsBoxOrderListBox.js b/src/prefsModules/PrefsBoxOrderListBox.js
index f80b8e0..f21c202 100644
--- a/src/prefsModules/PrefsBoxOrderListBox.js
+++ b/src/prefsModules/PrefsBoxOrderListBox.js
@@ -9,7 +9,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 
 var PrefsBoxOrderListBox = GObject.registerClass({
     GTypeName: "PrefsBoxOrderListBox",
-    Template: Me.dir.get_child("prefs-box-order-list-box.ui").get_uri()
+    Template: Me.dir.get_child("ui").get_child("prefs-box-order-list-box.ui").get_uri()
 }, class PrefsBoxOrderListBox extends Gtk.ListBox {
     /**
      * @param {Object} params
diff --git a/src/prefsModules/PrefsBoxOrderListEmptyPlaceholder.js b/src/prefsModules/PrefsBoxOrderListEmptyPlaceholder.js
index a5ded70..a6423e7 100644
--- a/src/prefsModules/PrefsBoxOrderListEmptyPlaceholder.js
+++ b/src/prefsModules/PrefsBoxOrderListEmptyPlaceholder.js
@@ -10,7 +10,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 
 var PrefsBoxOrderListEmptyPlaceholder = GObject.registerClass({
     GTypeName: "PrefsBoxOrderListEmptyPlaceholder",
-    Template: Me.dir.get_child("prefs-box-order-list-empty-placeholder.ui").get_uri()
+    Template: Me.dir.get_child("ui").get_child("prefs-box-order-list-empty-placeholder.ui").get_uri()
 }, class PrefsBoxOrderListEmptyPlaceholder extends Gtk.Box {
     _init(params = {}) {
         super._init(params);