diff --git a/.gitmodules b/.gitmodules
index d6e33fc..171f7e1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,9 +21,6 @@
 [submodule "configs/nvim/third_party/usda-syntax"]
 	path = configs/nvim/third_party/usda-syntax
 	url = https://github.com/superfunc/usda-syntax
-[submodule "third_party/ufw-application-profiles"]
-	path = third_party/ufw-application-profiles
-	url = https://github.com/ageis/ufw-application-profiles
 [submodule "configs/nvim/pack/smolck/start/command-completion.nvim"]
 	path = configs/nvim/pack/smolck/start/command-completion.nvim
 	url = https://github.com/smolck/command-completion.nvim
diff --git a/scripts/1p-bridge b/packages/1password-extras/bin/1p-bridge
similarity index 100%
rename from scripts/1p-bridge
rename to packages/1password-extras/bin/1p-bridge
diff --git a/scripts/aspath b/packages/network-utils/bin/aspath
similarity index 100%
rename from scripts/aspath
rename to packages/network-utils/bin/aspath
diff --git a/scripts/dig-authoritative b/packages/network-utils/bin/dig-authoritative
similarity index 100%
rename from scripts/dig-authoritative
rename to packages/network-utils/bin/dig-authoritative
diff --git a/scripts/ifpi b/packages/network-utils/bin/ifpi
similarity index 100%
rename from scripts/ifpi
rename to packages/network-utils/bin/ifpi
diff --git a/scripts/legacy-ssh b/packages/network-utils/bin/legacy-ssh
similarity index 100%
rename from scripts/legacy-ssh
rename to packages/network-utils/bin/legacy-ssh
diff --git a/scripts/localexpose b/packages/network-utils/bin/localexpose
similarity index 100%
rename from scripts/localexpose
rename to packages/network-utils/bin/localexpose
diff --git a/scripts/mtr-graph b/packages/network-utils/bin/mtr-graph
similarity index 100%
rename from scripts/mtr-graph
rename to packages/network-utils/bin/mtr-graph
diff --git a/scripts/tcp-reflect b/packages/network-utils/bin/tcp-reflect
similarity index 100%
rename from scripts/tcp-reflect
rename to packages/network-utils/bin/tcp-reflect
diff --git a/scripts/udp-reflect b/packages/network-utils/bin/udp-reflect
similarity index 100%
rename from scripts/udp-reflect
rename to packages/network-utils/bin/udp-reflect
diff --git a/scripts/ufw-del b/packages/network-utils/bin/ufw-del
similarity index 100%
rename from scripts/ufw-del
rename to packages/network-utils/bin/ufw-del
diff --git a/scripts/ufw-gen b/packages/network-utils/bin/ufw-gen
similarity index 100%
rename from scripts/ufw-gen
rename to packages/network-utils/bin/ufw-gen
diff --git a/scripts/watch-ports b/packages/network-utils/bin/watch-ports
similarity index 100%
rename from scripts/watch-ports
rename to packages/network-utils/bin/watch-ports
diff --git a/scripts/wg-cat b/packages/network-utils/bin/wg-cat
similarity index 100%
rename from scripts/wg-cat
rename to packages/network-utils/bin/wg-cat
diff --git a/scripts/wg-edit b/packages/network-utils/bin/wg-edit
similarity index 100%
rename from scripts/wg-edit
rename to packages/network-utils/bin/wg-edit
diff --git a/scripts/wg-genzone b/packages/network-utils/bin/wg-genzone
similarity index 100%
rename from scripts/wg-genzone
rename to packages/network-utils/bin/wg-genzone
diff --git a/scripts/wg-get-client-ip b/packages/network-utils/bin/wg-get-client-ip
similarity index 100%
rename from scripts/wg-get-client-ip
rename to packages/network-utils/bin/wg-get-client-ip
diff --git a/scripts/wg-handshakes b/packages/network-utils/bin/wg-handshakes
similarity index 100%
rename from scripts/wg-handshakes
rename to packages/network-utils/bin/wg-handshakes
diff --git a/scripts/wg-list-interfaces b/packages/network-utils/bin/wg-list-interfaces
similarity index 100%
rename from scripts/wg-list-interfaces
rename to packages/network-utils/bin/wg-list-interfaces
diff --git a/scripts/wg-peer-to-ipv6 b/packages/network-utils/bin/wg-peer-to-ipv6
similarity index 100%
rename from scripts/wg-peer-to-ipv6
rename to packages/network-utils/bin/wg-peer-to-ipv6
diff --git a/scripts/wg-reload b/packages/network-utils/bin/wg-reload
similarity index 100%
rename from scripts/wg-reload
rename to packages/network-utils/bin/wg-reload
diff --git a/scripts/wg-restart b/packages/network-utils/bin/wg-restart
similarity index 100%
rename from scripts/wg-restart
rename to packages/network-utils/bin/wg-restart
diff --git a/scripts/whois-util b/packages/network-utils/bin/whois-util
similarity index 100%
rename from scripts/whois-util
rename to packages/network-utils/bin/whois-util
diff --git a/scripts/wol b/packages/network-utils/bin/wol
similarity index 100%
rename from scripts/wol
rename to packages/network-utils/bin/wol
diff --git a/scripts/amprdns-delete-record b/packages/radio-utils/bin/amprdns-delete-record
similarity index 100%
rename from scripts/amprdns-delete-record
rename to packages/radio-utils/bin/amprdns-delete-record
diff --git a/scripts/amprdns-list-records b/packages/radio-utils/bin/amprdns-list-records
similarity index 100%
rename from scripts/amprdns-list-records
rename to packages/radio-utils/bin/amprdns-list-records
diff --git a/scripts/aprs-passcode b/packages/radio-utils/bin/aprs-passcode
similarity index 100%
rename from scripts/aprs-passcode
rename to packages/radio-utils/bin/aprs-passcode
diff --git a/scripts/aprs-to-mqtt b/packages/radio-utils/bin/aprs-to-mqtt
similarity index 100%
rename from scripts/aprs-to-mqtt
rename to packages/radio-utils/bin/aprs-to-mqtt
diff --git a/scripts/baofeng2gqrx b/packages/radio-utils/bin/baofeng2gqrx
similarity index 100%
rename from scripts/baofeng2gqrx
rename to packages/radio-utils/bin/baofeng2gqrx
diff --git a/scripts/kxchat b/packages/radio-utils/bin/kxchat
similarity index 100%
rename from scripts/kxchat
rename to packages/radio-utils/bin/kxchat
diff --git a/scripts/kxcq b/packages/radio-utils/bin/kxcq
similarity index 100%
rename from scripts/kxcq
rename to packages/radio-utils/bin/kxcq
diff --git a/scripts/kxfilter b/packages/radio-utils/bin/kxfilter
similarity index 100%
rename from scripts/kxfilter
rename to packages/radio-utils/bin/kxfilter
diff --git a/scripts/kxlisten b/packages/radio-utils/bin/kxlisten
similarity index 100%
rename from scripts/kxlisten
rename to packages/radio-utils/bin/kxlisten
diff --git a/scripts/kxpoweroff b/packages/radio-utils/bin/kxpoweroff
similarity index 100%
rename from scripts/kxpoweroff
rename to packages/radio-utils/bin/kxpoweroff
diff --git a/scripts/kxpwr b/packages/radio-utils/bin/kxpwr
similarity index 100%
rename from scripts/kxpwr
rename to packages/radio-utils/bin/kxpwr
diff --git a/scripts/kxqrl b/packages/radio-utils/bin/kxqrl
similarity index 100%
rename from scripts/kxqrl
rename to packages/radio-utils/bin/kxqrl
diff --git a/scripts/kxsend b/packages/radio-utils/bin/kxsend
similarity index 100%
rename from scripts/kxsend
rename to packages/radio-utils/bin/kxsend
diff --git a/scripts/kxtune b/packages/radio-utils/bin/kxtune
similarity index 100%
rename from scripts/kxtune
rename to packages/radio-utils/bin/kxtune
diff --git a/scripts/minimodem-bidirectional b/packages/radio-utils/bin/minimodem-bidirectional
similarity index 100%
rename from scripts/minimodem-bidirectional
rename to packages/radio-utils/bin/minimodem-bidirectional
diff --git a/scripts/pskreporter-to-mqtt b/packages/radio-utils/bin/pskreporter-to-mqtt
similarity index 100%
rename from scripts/pskreporter-to-mqtt
rename to packages/radio-utils/bin/pskreporter-to-mqtt
diff --git a/scripts/rbn-download-range b/packages/radio-utils/bin/rbn-download-range
similarity index 100%
rename from scripts/rbn-download-range
rename to packages/radio-utils/bin/rbn-download-range
diff --git a/scripts/rbn-grep b/packages/radio-utils/bin/rbn-grep
similarity index 100%
rename from scripts/rbn-grep
rename to packages/radio-utils/bin/rbn-grep
diff --git a/scripts/rbn-to-mqtt b/packages/radio-utils/bin/rbn-to-mqtt
similarity index 100%
rename from scripts/rbn-to-mqtt
rename to packages/radio-utils/bin/rbn-to-mqtt
diff --git a/scripts/spotwatch b/packages/radio-utils/bin/spotwatch
similarity index 100%
rename from scripts/spotwatch
rename to packages/radio-utils/bin/spotwatch
diff --git a/third_party/ufw-application-profiles b/third_party/ufw-application-profiles
deleted file mode 160000
index 63cdef1..0000000
--- a/third_party/ufw-application-profiles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63cdef13e1fcaa41da500763dc2ca95da0f31486