diff --git a/.gitignore b/.gitignore
index 881e1b179..3c7fad4b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,11 +165,11 @@
 /xcode/CUPS.xcodeproj/project.xcworkspace/
 /xcode/CUPS.xcodeproj/xcuserdata/
 .DS_store
-container-config
-packages/parts
-packages/stage
-packages/prime
+/container-config
+/packaging/parts
+/packaging/stage
+/packaging/prime
 *.snap
 *.tar*
-packages/snap/.snapcraft
+/packaging/snap/.snapcraft
 *.rock
\ No newline at end of file
diff --git a/packaging/rockcraft.yaml b/packaging/rockcraft.yaml
index d624a2dfe..c51c07c44 100644
--- a/packaging/rockcraft.yaml
+++ b/packaging/rockcraft.yaml
@@ -50,16 +50,11 @@ parts:
       - --disable-systemd
       - --without-rcdir
       - --with-docdir=/share/cups/doc
-      # We use "--with-tls=gnutls" here, as current CUPS defaults to SSL here
-      # and this is buggy, causing a segfault when serving out a HTTPS web
-      # interface page.
-      - --with-tls=gnutls
     build-packages:
       - git
       - sed
       - curl
       - perl-base
-      - patch
       - autoconf
       - automake
       - libtool
@@ -393,7 +388,7 @@ parts:
 
   scripts:
     plugin: dump
-    source: scripts/
+    source: scripts/rock/
     organize:
       run-cupsd.sh: /scripts/run-cupsd.sh
       run-dbus.sh: /scripts/run-dbus.sh
diff --git a/packaging/scripts/run-cupsd.sh b/packaging/scripts/rock/run-cupsd.sh
similarity index 99%
rename from packaging/scripts/run-cupsd.sh
rename to packaging/scripts/rock/run-cupsd.sh
index f9646f5ba..10feed7e7 100644
--- a/packaging/scripts/run-cupsd.sh
+++ b/packaging/scripts/rock/run-cupsd.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -eux
 
 # Ensure the lpadmin group exists
diff --git a/packaging/scripts/run-dbus.sh b/packaging/scripts/rock/run-dbus.sh
similarity index 99%
rename from packaging/scripts/run-dbus.sh
rename to packaging/scripts/rock/run-dbus.sh
index 2fa8c0e96..4915eb1ba 100644
--- a/packaging/scripts/run-dbus.sh
+++ b/packaging/scripts/rock/run-dbus.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -eux
 
 echo "Creating system users"
diff --git a/packaging/scripts/port-occupied.c b/packaging/scripts/snap/port-occupied.c
similarity index 100%
rename from packaging/scripts/port-occupied.c
rename to packaging/scripts/snap/port-occupied.c
diff --git a/packaging/scripts/reload-cups-browsed b/packaging/scripts/snap/reload-cups-browsed
similarity index 100%
rename from packaging/scripts/reload-cups-browsed
rename to packaging/scripts/snap/reload-cups-browsed
diff --git a/packaging/scripts/reload-cupsd b/packaging/scripts/snap/reload-cupsd
similarity index 100%
rename from packaging/scripts/reload-cupsd
rename to packaging/scripts/snap/reload-cupsd
diff --git a/packaging/scripts/run-cups-browsed b/packaging/scripts/snap/run-cups-browsed
similarity index 100%
rename from packaging/scripts/run-cups-browsed
rename to packaging/scripts/snap/run-cups-browsed
diff --git a/packaging/scripts/run-cupsd b/packaging/scripts/snap/run-cupsd
similarity index 100%
rename from packaging/scripts/run-cupsd
rename to packaging/scripts/snap/run-cupsd
diff --git a/packaging/scripts/run-util b/packaging/scripts/snap/run-util
similarity index 100%
rename from packaging/scripts/run-util
rename to packaging/scripts/snap/run-util
diff --git a/packaging/scripts/stop-cups-browsed b/packaging/scripts/snap/stop-cups-browsed
similarity index 100%
rename from packaging/scripts/stop-cups-browsed
rename to packaging/scripts/snap/stop-cups-browsed
diff --git a/packaging/scripts/stop-cupsd b/packaging/scripts/snap/stop-cupsd
similarity index 100%
rename from packaging/scripts/stop-cupsd
rename to packaging/scripts/snap/stop-cupsd
diff --git a/packaging/snapcraft.yaml b/packaging/snapcraft.yaml
index 2b4586b64..b35541ab0 100644
--- a/packaging/snapcraft.yaml
+++ b/packaging/snapcraft.yaml
@@ -188,10 +188,6 @@ parts:
       - --without-rcdir
       - --with-docdir=/share/cups/doc
       - --with-container=snap
-      # We use "--with-tls=gnutls" here, as current CUPS defaults to SSL here
-      # and this is buggy, causing a segfault when serving out a HTTPS web
-      # interface page.
-      - --with-tls=gnutls
       #- --enable-debug-printfs
     override-pull: |
       set -eux
@@ -644,7 +640,7 @@ parts:
 
   scripts:
     plugin: dump
-    source: scripts/
+    source: scripts/snap
     override-build: |
       set -eux
       gcc -o port-occupied port-occupied.c