diff --git a/plist b/plist
index db00f2a63..5d7bda812 100644
--- a/plist
+++ b/plist
@@ -117,25 +117,25 @@
 /usr/local/etc/rc.subr.d/tmp
 /usr/local/etc/rc.subr.d/var
 /usr/local/etc/rc.syshook
-/usr/local/etc/rc.syshook.d/05-beep.stop
-/usr/local/etc/rc.syshook.d/05-update.early
-/usr/local/etc/rc.syshook.d/10-configd.early
-/usr/local/etc/rc.syshook.d/10-newwanip.start
-/usr/local/etc/rc.syshook.d/15-php.early
-/usr/local/etc/rc.syshook.d/20-backup.early
-/usr/local/etc/rc.syshook.d/20-freebsd.start
-/usr/local/etc/rc.syshook.d/80-freebsd.stop
-/usr/local/etc/rc.syshook.d/90-backup.stop
-/usr/local/etc/rc.syshook.d/90-carp.start
-/usr/local/etc/rc.syshook.d/90-cron.start
-/usr/local/etc/rc.syshook.d/95-beep.start
-/usr/local/etc/rc.syshook.d/99-config.stop
 /usr/local/etc/rc.syshook.d/backup/20-captiveportal
 /usr/local/etc/rc.syshook.d/backup/20-dhcpleases
 /usr/local/etc/rc.syshook.d/backup/20-duid
 /usr/local/etc/rc.syshook.d/backup/20-netflow
 /usr/local/etc/rc.syshook.d/backup/20-rrd
 /usr/local/etc/rc.syshook.d/carp/20-openvpn
+/usr/local/etc/rc.syshook.d/early/05-update
+/usr/local/etc/rc.syshook.d/early/10-configd
+/usr/local/etc/rc.syshook.d/early/15-php
+/usr/local/etc/rc.syshook.d/early/20-backup
+/usr/local/etc/rc.syshook.d/start/10-newwanip
+/usr/local/etc/rc.syshook.d/start/20-freebsd
+/usr/local/etc/rc.syshook.d/start/90-carp
+/usr/local/etc/rc.syshook.d/start/90-cron
+/usr/local/etc/rc.syshook.d/start/95-beep
+/usr/local/etc/rc.syshook.d/stop/05-beep
+/usr/local/etc/rc.syshook.d/stop/80-freebsd
+/usr/local/etc/rc.syshook.d/stop/90-backup
+/usr/local/etc/rc.syshook.d/stop/99-config
 /usr/local/etc/rc.update_bogons
 /usr/local/etc/ssl/opnsense.cnf
 /usr/local/opnsense/contrib/IXR/IXR_Library.php
diff --git a/src/etc/rc.syshook.d/05-update.early b/src/etc/rc.syshook.d/early/05-update
similarity index 100%
rename from src/etc/rc.syshook.d/05-update.early
rename to src/etc/rc.syshook.d/early/05-update
diff --git a/src/etc/rc.syshook.d/10-configd.early b/src/etc/rc.syshook.d/early/10-configd
similarity index 100%
rename from src/etc/rc.syshook.d/10-configd.early
rename to src/etc/rc.syshook.d/early/10-configd
diff --git a/src/etc/rc.syshook.d/15-php.early b/src/etc/rc.syshook.d/early/15-php
similarity index 100%
rename from src/etc/rc.syshook.d/15-php.early
rename to src/etc/rc.syshook.d/early/15-php
diff --git a/src/etc/rc.syshook.d/20-backup.early b/src/etc/rc.syshook.d/early/20-backup
similarity index 100%
rename from src/etc/rc.syshook.d/20-backup.early
rename to src/etc/rc.syshook.d/early/20-backup
diff --git a/src/etc/rc.syshook.d/10-newwanip.start b/src/etc/rc.syshook.d/start/10-newwanip
similarity index 100%
rename from src/etc/rc.syshook.d/10-newwanip.start
rename to src/etc/rc.syshook.d/start/10-newwanip
diff --git a/src/etc/rc.syshook.d/20-freebsd.start b/src/etc/rc.syshook.d/start/20-freebsd
similarity index 100%
rename from src/etc/rc.syshook.d/20-freebsd.start
rename to src/etc/rc.syshook.d/start/20-freebsd
diff --git a/src/etc/rc.syshook.d/90-carp.start b/src/etc/rc.syshook.d/start/90-carp
similarity index 100%
rename from src/etc/rc.syshook.d/90-carp.start
rename to src/etc/rc.syshook.d/start/90-carp
diff --git a/src/etc/rc.syshook.d/90-cron.start b/src/etc/rc.syshook.d/start/90-cron
similarity index 100%
rename from src/etc/rc.syshook.d/90-cron.start
rename to src/etc/rc.syshook.d/start/90-cron
diff --git a/src/etc/rc.syshook.d/95-beep.start b/src/etc/rc.syshook.d/start/95-beep
similarity index 100%
rename from src/etc/rc.syshook.d/95-beep.start
rename to src/etc/rc.syshook.d/start/95-beep
diff --git a/src/etc/rc.syshook.d/05-beep.stop b/src/etc/rc.syshook.d/stop/05-beep
similarity index 100%
rename from src/etc/rc.syshook.d/05-beep.stop
rename to src/etc/rc.syshook.d/stop/05-beep
diff --git a/src/etc/rc.syshook.d/80-freebsd.stop b/src/etc/rc.syshook.d/stop/80-freebsd
similarity index 100%
rename from src/etc/rc.syshook.d/80-freebsd.stop
rename to src/etc/rc.syshook.d/stop/80-freebsd
diff --git a/src/etc/rc.syshook.d/90-backup.stop b/src/etc/rc.syshook.d/stop/90-backup
similarity index 100%
rename from src/etc/rc.syshook.d/90-backup.stop
rename to src/etc/rc.syshook.d/stop/90-backup
diff --git a/src/etc/rc.syshook.d/99-config.stop b/src/etc/rc.syshook.d/stop/99-config
similarity index 100%
rename from src/etc/rc.syshook.d/99-config.stop
rename to src/etc/rc.syshook.d/stop/99-config