diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 8ac15c3e89211a84ce87ff9555ef9d65aacbc1ec..7b1850c003620b885df6ab7593c6514d34eb44d2 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-baselayout
 pkgver=0.13.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for alpine-baselayout"
-url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
+url="http://git.alpinelinux.org/cgit/acf/acf-alpine-baselayout"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-json4 lua-posix"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index 269bae54837f586653e29c2aaa793f314bb9b941..ccb51fe5f65f03b58518e8a5a3f21cf7500426e0 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-conf
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for alpine-conf"
-url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
+url="http://git.alpinelinux.org/cgit/acf/acf-alpine-conf"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-posix openssl"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index f619382d2cdc5da474e3bad7d714780f0880da0f..4681400393cc44747dad28ce514a678dc15ae9bf 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-amavisd-new
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for amavis"
-url="http://git.alpinelinux.org/cgit/acf-amavisd-new"
+url="http://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
 arch="noarch"
 license="GPL2"
 depends="acf-core amavisd-new"
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 10fa27d4af8bb80e8ac268633d5077d2977bd4b4..88c5670d360fb96aeafcd174719f84398148475d 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-apk-tools
 pkgver=0.11.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF module for apk"
-url="http://git.alpinelinux.org/cgit/acf-apk-tools"
+url="http://git.alpinelinux.org/cgit/acf/acf-apk-tools"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-posix apk-tools"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 680d2872a6067163592735ad3c9735e118fe51e2..5022d2b2c21c1b5184588cdbd677c54b7d0a22fc 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-asterisk
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for asterisk"
-url="http://git.alpinelinux.org/cgit/acf-asterisk"
+url="http://git.alpinelinux.org/cgit/acf/acf-asterisk"
 arch="noarch"
 license="GPL2"
 depends="acf-core asterisk"
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index 27133d8b23e03171cd7531829fa21fe6e6d8d75c..b3d4e8223e67e778fbdc42b8a82db2533b813e55 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-awall
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF for Alpine Wall"
-url="http://git.alpinelinux.org/cgit/acf-awall"
+url="http://git.alpinelinux.org/cgit/acf/acf-awall"
 arch="noarch"
 license="GPL2"
 depends="acf-core awall"
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index b4d4b7d59faccc6c6b8e92d37173b65da0838507..c75ae6a910c6cad7cd6ceae0aa003ed2e96b732c 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-chrony
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for chrony"
-url="http://git.alpinelinux.org/cgit/acf-chrony"
+url="http://git.alpinelinux.org/cgit/acf/acf-chrony"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-posix chrony"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index a25a0c9480fef13546184618b787d84249075cec..a2d9fd77879c81a78e478ba0a6279908fa693d85 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamav
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for clamav"
-url="http://git.alpinelinux.org/cgit/acf-clamav"
+url="http://git.alpinelinux.org/cgit/acf/acf-clamav"
 arch="noarch"
 license="GPL2"
 depends="acf-core clamav"
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index 6fd85c2cf9ce2f49263ae282e5ce6611ebcd517d..162d4a7dd5beaa55058a3bedf2236bdb15ad6ab5 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-clamsmtp
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for clamsmtp"
-url="http://git.alpinelinux.org/cgit/acf-clamsmtp"
+url="http://git.alpinelinux.org/cgit/acf/acf-clamsmtp"
 arch="noarch"
 license="GPL2"
 depends="acf-core clamsmtp"
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 40bb18192e3de88e0588ca5099608b5008cbd209..798b3d0ac199e0865ad0cf5b3e05fc8bde16e452 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -3,9 +3,9 @@
 _luaversion="5.2"
 pkgname=acf-core
 pkgver=0.20.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface framework"
-url="http://git.alpinelinux.org/cgit/acf-core"
+url="http://git.alpinelinux.org/cgit/acf/acf-core"
 arch="noarch"
 license="GPL2"
 install="$pkgname.post-upgrade"
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 654594bb766e26586be408f09e95d29b56725748..1c1701c031a4e7eb7d9b06b55d23b694c45a9d28 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dansguardian
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dansguardian"
-url="http://git.alpinelinux.org/cgit/acf-dansguardian"
+url="http://git.alpinelinux.org/cgit/acf/acf-dansguardian"
 arch="noarch"
 license="GPL2"
 depends="acf-core dansguardian"
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index 9bd95adb9aa1eb48a66fcafc8fd2da72173fe496..7ae516beffcc35002c3365d98ec5a0402029efc5 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-db
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for databases"
-url="http://git.alpinelinux.org/cgit/acf-db"
+url="http://git.alpinelinux.org/cgit/acf/acf-db"
 arch="noarch"
 license="GPL2"
 depends="acf-core acf-db-lib"
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index 7067b56d5a3c6694d0bbcd51e2c8e7e188ecb755..3fa21f5d1b4c3b6f752d0f77fda938abfee650fc 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dhcp
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dhcp"
-url="http://git.alpinelinux.org/cgit/acf-dhcp"
+url="http://git.alpinelinux.org/cgit/acf/acf-dhcp"
 arch="noarch"
 license="GPL2"
 depends="acf-core dhcp"
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 2c37bb44e6cd063505a98c74279706c11b471f5f..585adebb9542a2276223e042f07859c5db43ab72 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnscache
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dnscache"
-url="http://git.alpinelinux.org/cgit/acf-dnscache"
+url="http://git.alpinelinux.org/cgit/acf/acf-dnscache"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-posix dnscache"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index f74c20c20871d7ea83578b032216e522580f26ec..3da1f3b78d46352a1160bf48fb405131e77f87a4 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dnsmasq"
-url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
+url="http://git.alpinelinux.org/cgit/acf/acf-dnsmasq"
 arch="noarch"
 license="GPL2"
 depends="acf-core dnsmasq"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index 0f9a4b5b98c99ff09b1cf223adb5a77a5b766f15..678a21aab7ec5d920f7ef2525ab5a7a0ba735a0d 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dovecot
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for dovecot"
-url="http://git.alpinelinux.org/cgit/acf-dovecot"
+url="http://git.alpinelinux.org/cgit/acf/acf-dovecot"
 arch="noarch"
 license="GPL2"
 depends="acf-core dovecot"
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index 5435f5c9d08c8f94ef37d967858994cd809eebee..9a5f8b168d7915f1a5505c8b1259a6291a75f22d 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-fetchmail
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for fetchmail"
-url="http://git.alpinelinux.org/cgit/acf-fetchmail"
+url="http://git.alpinelinux.org/cgit/acf/acf-fetchmail"
 arch="noarch"
 license="GPL2"
 depends="acf-core fetchmail"
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index 011216d01aa3f8a98847c2ff8086280e1c64f81c..2f6055211fef5686abb1cbeb7388a6e00f143d6f 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeradius3
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF for freeradius 3"
-url="http://git.alpinelinux.org/cgit/acf-freeradius3"
+url="http://git.alpinelinux.org/cgit/acf/acf-freeradius3"
 arch="noarch"
 license="GPL2"
 depends="acf-core freeradius>3"
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index 573513d3669a9e8518779e9c1243ff20a77534e6..17686c65998189d6ebe835b065856156912072ef 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch-vmail
 pkgver=0.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for a web interface for freeswitch voicemail"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="all"
 license="GPL2"
 depends="acf-core lua-sql-sqlite3 lua-socket freeswitch"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index 75a5b9ade4e0e2b6e37fc48167e0251ec6eabd4b..90e70c92fd64b21d18d6e12ab6a699def2884c57 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF for freeswitch"
-url="http://git.alpinelinux.org/cgit/acf-freeswitch"
+url="http://git.alpinelinux.org/cgit/acf/acf-freeswitch"
 arch="noarch"
 license="GPL2"
 depends="acf-core freeswitch lua-xml"
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index ae7881e0606cefd6920e6ee2d4efcc85cc03c8d2..f695abb6f6358dd02524a937e6a8cdc58c60e332 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-gross
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for gross"
-url="http://git.alpinelinux.org/cgit/acf-gross"
+url="http://git.alpinelinux.org/cgit/acf/acf-gross"
 arch="noarch"
 license="GPL2"
 depends="acf-core gross"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 5a06b47b9fc1daed0cdb1a4ff639b00d0122a0d9..fc76c0b63021fd4cd6384fb952dc4efc3ce9b7df 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-heimdal
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for heimdal"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core heimdal"
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index f0dff4b937575176c0c770b95dbfacf1ff115290..ae61f1b6e0abb81ca24bde50630a0e52ea1a5b73 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iproute2-qos
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for iproute2-qos"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core iproute2-qos acf-alpine-baselayout>=0.5.7"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index 6eb94d006fd4150b24ca11fe11526c9ab5cd66bf..05fcd4690e8968870df7789f38b10363585e4dea 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ipsec-tools
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for ipsec-tools"
-url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
+url="http://git.alpinelinux.org/cgit/acf/acf-ipsec-tools"
 arch="noarch"
 license="GPL2"
 depends="acf-core ipsec-tools"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 2e8b9539259d61174c03323cbc09a7a1badab1ba..cb494d60fcc22f05c08ff5beced171643614a999 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iptables
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for iptables"
-url="http://git.alpinelinux.org/cgit/acf-iptables"
+url="http://git.alpinelinux.org/cgit/acf/acf-iptables"
 arch="noarch"
 license="GPL2"
 depends="acf-core iptables"
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index 60531d055f730d7b3e6f3191e657c75a723279f8..7759aeab4a9c281bfa36022d4f9da3d91cdeb401 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="jquery libraries for ACF"
-url="http://git.alpinelinux.org/cgit/acf-jquery"
+url="http://git.alpinelinux.org/cgit/acf/acf-jquery"
 arch="noarch"
 license="GPL2"
 depends=""
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index a86b0deb84d4243715dc16038cca948ef5ce1ace..87a847f13ecf04b87ddbed6dccf745b948eab941 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-kamailio
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for kamailio"
-url="http://git.alpinelinux.org/cgit/acf-kamailio"
+url="http://git.alpinelinux.org/cgit/acf/acf-kamailio"
 arch="noarch"
 license="GPL2"
 depends="acf-core kamailio acf-db-lib"
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index ee0696d6968ac3fa9df4f1f725370dda1aa77b7a..fe472b6c70976485ac88862c0ac2130dc2458490 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -3,9 +3,9 @@
 _luaversions="5.1 5.2"
 pkgname=acf-lib
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua libraries for ACF"
-url="http://git.alpinelinux.org/cgit/acf-lib"
+url="http://git.alpinelinux.org/cgit/acf/acf-lib"
 arch="noarch"
 license="GPL2"
 depends="lua-subprocess"
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index 2840abb749830fadde8a394e90ae073fbb517937..e3fb47560b4058ebd87762b00a28f3579632900f 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lighttpd
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for lighttpd"
-url="http://git.alpinelinux.org/cgit/acf-lighttpd"
+url="http://git.alpinelinux.org/cgit/acf/acf-lighttpd"
 arch="noarch"
 license="GPL2"
 depends="acf-core lighttpd"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 24a95b915b83d2699d57a23472b775dd7022f3c8..e37757d35092dffa67eebfb6488b0475b781b90e 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lvm2
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for lvm2"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core lvm2"
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index 03ba406133fcb594a49fea9b6a453c5d72a1bc7c..05eaf2645e601dc428c8183ccc856a1955ae6b02 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mariadb
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for mariadb"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core mariadb mariadb-client lua-sql-mysql acf-db-lib"
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index ef884bab3909ac1090204a69f0acad09647dc00e..293ac0e27cdfdb3efcaf6835cf54cfcbb5688219 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mdadm
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for mdadm"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core mdadm"
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index 9d363f2f91e91e70d28d64f222ac670d9f16034f..d85b107728f05b2c4315f05aa9405d668f253254 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=acf-openldap
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="ACF module for OpenLDAP"
-url="http://git.alpinelinux.org/cgit/alacerda/$pkgname/"
+url="http://git.alpinelinux.org/cgit/user/alacerda/$pkgname/"
 arch="noarch"
 license="GPL2"
 depends="acf-core openldap openldap-back-bdb"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 22b7e6e87242577570eb6961d70912f6e0cb0091..dd537781b8d08e7afd6243cf6391d512ef224fb5 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-opennhrp
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for opennhrp"
-url="http://git.alpinelinux.org/cgit/acf-opennhrp"
+url="http://git.alpinelinux.org/cgit/acf/acf-opennhrp"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-posix opennhrp"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index 8c17ddbab7283809eafd51e8bc38277fb88b399f..8ccce890fcd17164b97aaec08798d2c0d197cd59 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openntpd
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openntpd"
-url="http://git.alpinelinux.org/cgit/acf-openntpd"
+url="http://git.alpinelinux.org/cgit/acf/acf-openntpd"
 arch="noarch"
 license="GPL2"
 depends="acf-core openntpd"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 74c728932bf57fcb0ae86550ae2ee2fe454306c4..4359fbcf128478efaa0889e31eeca175c3100f9b 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssh
 pkgver=0.11.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for openssh"
-url="http://git.alpinelinux.org/cgit/acf-openssh"
+url="http://git.alpinelinux.org/cgit/acf/acf-openssh"
 arch="noarch"
 license="GPL2"
 depends="acf-core openssh"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index 948f0dd5800ea025d443a8e5a1149e8eb4df9634..46b56a5fd656cc48a7f1a3f37998d29781abe835 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssl
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openssl"
-url="http://git.alpinelinux.org/cgit/acf-openssl"
+url="http://git.alpinelinux.org/cgit/acf/acf-openssl"
 arch="noarch"
 license="GPL2"
 depends="acf-core openssl"
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 9dcff9700d69f63473a65004c635228e9fdbda6e..e53bf310938ededa6005f0352ca1c34017d3f84e 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openvpn
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for openvpn"
-url="http://git.alpinelinux.org/cgit/acf-openvpn"
+url="http://git.alpinelinux.org/cgit/acf/acf-openvpn"
 arch="noarch"
 license="GPL2"
 depends="acf-core openvpn"
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index da27013450cab2b884063bdbbbeea75e2ff4095d..53b2e80470d74a14c7085c48ee4a27e2942812b9 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-pingu
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for pingu"
-url="http://git.alpinelinux.org/cgit/acf-pingu"
+url="http://git.alpinelinux.org/cgit/acf/acf-pingu"
 arch="noarch"
 license="GPL2"
 depends="acf-core pingu"
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index 7fd621fcef6dbdffd991654682b0a199e6f9453a..73a3acb9be7cc1955b7647c25cfa2fa579a80ed4 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postfix
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for postfix"
-url="http://git.alpinelinux.org/cgit/acf-postfix"
+url="http://git.alpinelinux.org/cgit/acf/acf-postfix"
 arch="noarch"
 license="GPL2"
 depends="acf-core postfix"
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 01f1ae5ac6e7350a483f5dcc1d06ae1af1cefd0d..23f7ce6059a8bf71b61e2149c31dfe92ea5949c0 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postgresql
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="ACF module for postgresql"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core postgresql acf-db-lib lua-sql-postgres"
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index 56e8a544219e6882f961d2b54c6b7fb50ff85061..d934798cc0208977fa70b1eb390bc182b155d7f9 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ppp
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for ppp"
-url="http://git.alpinelinux.org/cgit/acf-ppp"
+url="http://git.alpinelinux.org/cgit/acf/acf-ppp"
 arch="noarch"
 license="GPL2"
 depends="acf-core ppp"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 9a827f8caf42439da8b41258cece07ea04883fe0..dbf2590f1f3ef994ac55cce57de227944b994de3 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -3,9 +3,9 @@
 _luaversion=5.2
 pkgname=acf-provisioning
 pkgver=0.9.4
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for provisioning templated configs to devices"
-url="http://git.alpinelinux.org/cgit/acf-provisioning"
+url="http://git.alpinelinux.org/cgit/acf/acf-provisioning"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-sql-postgres postgresql-client lua-posixtz lua-xml"
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 6ae4670da08c7f8ff88fa87970782f11bff27bff..d7151e1844d22477875cf033ecc82e1f0974551b 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-quagga
 pkgver=0.10.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for quagga"
-url="http://git.alpinelinux.org/cgit/acf-quagga"
+url="http://git.alpinelinux.org/cgit/acf/acf-quagga"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-socket quagga"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index b2b6e812ea08b9793013ecc512d61a5e3804d6ca..889b0bab8686dfef3c07580348389269df2b4324 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-samba
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for samba"
-url="http://git.alpinelinux.org/cgit/acf-samba"
+url="http://git.alpinelinux.org/cgit/acf/acf-samba"
 arch="noarch"
 license="GPL2"
 depends="acf-core samba"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index c1573b438a9f927e640616247804185fb9197083..d7f7bf0f1348e2374c0ecbd29f48d770ca7798a0 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins
 pkgver=0.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Skins for ACF"
-url="http://git.alpinelinux.org/cgit/acf-skins"
+url="http://git.alpinelinux.org/cgit/acf/acf-skins"
 arch="noarch"
 license="GPL2"
 depends=""
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index 61793cc71ceb5ce8048bafdacb946613178de1cd..89a7db4e8b80a1ba16dff059c2551777befe5dc4 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-snort
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for snort"
-url="http://git.alpinelinux.org/cgit/acf-snort"
+url="http://git.alpinelinux.org/cgit/acf/acf-snort"
 arch="noarch"
 license="GPL2"
 depends="acf-core snort"
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 1d67bec72bd67bed3dc4261a6cedee9cd2ea870b..05b6ea087809559b1e65d086c65c56cd01eec79a 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-squid
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for squid"
-url="http://git.alpinelinux.org/cgit/acf-squid"
+url="http://git.alpinelinux.org/cgit/acf/acf-squid"
 arch="noarch"
 license="GPL2"
 depends="acf-core squid"
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index 2fd3d4889e84582023cae338c3c8c8a1861e1112..fa74e6e3792778a4638a620319c812de8175ecae 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tcpproxy
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for tcpproxy"
-url="http://git.alpinelinux.org/cgit/acf-tcpproxy"
+url="http://git.alpinelinux.org/cgit/acf/acf-tcpproxy"
 arch="noarch"
 license="GPL2"
 depends="acf-core tcpproxy"
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 25f4cb2233a788f91ef20a97d30a0f6e0239cd8b..76dfcaf51c7a9722f6041861cadde8c5c682fc05 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tinydns
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for tinydns"
-url="http://git.alpinelinux.org/cgit/acf-tinydns"
+url="http://git.alpinelinux.org/cgit/acf/acf-tinydns"
 arch="noarch"
 license="GPL2"
 depends="acf-core tinydns"
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index fd41cf007dccd517c9ce1bfed5648c59986f6254..bb42685a24e05a629a5a28c9c5916a954ae01c28 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-unbound
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for unbound"
-url="http://git.alpinelinux.org/cgit/$pkgname"
+url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
 license="GPL2"
 depends="acf-core unbound"
diff --git a/main/acf-vlc-daemon/APKBUILD b/main/acf-vlc-daemon/APKBUILD
index 0657485ab90098771f9e21bb295f8197bd02c632..af0712c317e4aca326d726f80a109b8babc52bb0 100644
--- a/main/acf-vlc-daemon/APKBUILD
+++ b/main/acf-vlc-daemon/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer:
 pkgname=acf-vlc-daemon
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based system administration interface for vlc"
-url="http://git.alpinelinux.org/cgit/acf-vlc-daemon"
+url="http://git.alpinelinux.org/cgit/acf/acf-vlc-daemon"
 arch="noarch"
 license="GPL2"
 depends="acf-core vlc-daemon"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 62006b9b6888e829f45b8a5bb672dce2f60ee0ef..a304da19c913b33f56e54b8fa5d8ef33ea384458 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-weblog
 pkgver=0.11.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
-url="http://git.alpinelinux.org/cgit/acf-weblog"
+url="http://git.alpinelinux.org/cgit/acf/acf-weblog"
 arch="noarch"
 license="GPL2"
 depends="acf-core lua-sql-postgres wget postgresql-client lua-subprocess"
diff --git a/unmaintained/acf-jquery-mobile/APKBUILD b/unmaintained/acf-jquery-mobile/APKBUILD
index ff482f06984ddf225c9cd9b62745fa076f0afd55..f866c964f7e3f174fbace9afa6d95afd7449f6b7 100644
--- a/unmaintained/acf-jquery-mobile/APKBUILD
+++ b/unmaintained/acf-jquery-mobile/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery-mobile
 pkgver=0.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="jquery mobile libraries for ACF"
-url="http://git.alpinelinux.org/cgit/acf-jquery-mobile"
+url="http://git.alpinelinux.org/cgit/acf/acf-jquery-mobile"
 arch="noarch"
 license="GPL2"
 depends="acf-jquery"
diff --git a/unmaintained/acf-skins-jqmobile/APKBUILD b/unmaintained/acf-skins-jqmobile/APKBUILD
index 7260a4c4e23ffba558a5eae04a69ab549f1035de..16a39e766f0cb6d0ec2f2e5f69fe722af1589c63 100644
--- a/unmaintained/acf-skins-jqmobile/APKBUILD
+++ b/unmaintained/acf-skins-jqmobile/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins-jqmobile
 pkgver=0.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ACF skin based upon jquery mobile"
-url="http://git.alpinelinux.org/cgit/acf-skins-jqmobile"
+url="http://git.alpinelinux.org/cgit/acf/acf-skins-jqmobile"
 arch="noarch"
 license="GPL2"
 depends="acf-skins acf-jquery-mobile"