diff --git a/net/tor/Makefile b/security/tor/Makefile
similarity index 100%
rename from net/tor/Makefile
rename to security/tor/Makefile
diff --git a/net/tor/src/etc/inc/plugins.inc.d/tor.inc b/security/tor/src/etc/inc/plugins.inc.d/tor.inc
similarity index 100%
rename from net/tor/src/etc/inc/plugins.inc.d/tor.inc
rename to security/tor/src/etc/inc/plugins.inc.d/tor.inc
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_exitpolicy.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_exitpolicy.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_exitpolicy.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_exitpolicy.xml
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_sockspolicy.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_sockspolicy.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_sockspolicy.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/acl_sockspolicy.xml
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/general.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/general.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/general.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/general.xml
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service.xml
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service_acl.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service_acl.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service_acl.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/hidden_service_acl.xml
diff --git a/net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml
rename to security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/forms/relay.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACL/ACL.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACL/ACL.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACL/ACL.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACL/ACL.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLExitPolicy.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/ACLSocksPolicy.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenService.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/HiddenServiceACL.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.php b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.php
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.php
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.php
diff --git a/net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml
rename to security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Relay.xml
diff --git a/net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
similarity index 100%
rename from net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
rename to security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
diff --git a/net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf b/security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
similarity index 100%
rename from net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
rename to security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
diff --git a/net/tor/src/opnsense/service/scripts/tor/gen_key b/security/tor/src/opnsense/service/scripts/tor/gen_key
similarity index 100%
rename from net/tor/src/opnsense/service/scripts/tor/gen_key
rename to security/tor/src/opnsense/service/scripts/tor/gen_key
diff --git a/net/tor/src/opnsense/service/scripts/tor/get_hostnames b/security/tor/src/opnsense/service/scripts/tor/get_hostnames
similarity index 100%
rename from net/tor/src/opnsense/service/scripts/tor/get_hostnames
rename to security/tor/src/opnsense/service/scripts/tor/get_hostnames
diff --git a/net/tor/src/opnsense/service/scripts/tor/setup.sh b/security/tor/src/opnsense/service/scripts/tor/setup.sh
similarity index 100%
rename from net/tor/src/opnsense/service/scripts/tor/setup.sh
rename to security/tor/src/opnsense/service/scripts/tor/setup.sh
diff --git a/net/tor/src/opnsense/service/scripts/tor/tor_helper.php b/security/tor/src/opnsense/service/scripts/tor/tor_helper.php
similarity index 100%
rename from net/tor/src/opnsense/service/scripts/tor/tor_helper.php
rename to security/tor/src/opnsense/service/scripts/tor/tor_helper.php
diff --git a/net/tor/src/opnsense/service/templates/OPNsense/Tor/+TARGETS b/security/tor/src/opnsense/service/templates/OPNsense/Tor/+TARGETS
similarity index 100%
rename from net/tor/src/opnsense/service/templates/OPNsense/Tor/+TARGETS
rename to security/tor/src/opnsense/service/templates/OPNsense/Tor/+TARGETS
diff --git a/net/tor/src/opnsense/service/templates/OPNsense/Tor/tor b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
similarity index 100%
rename from net/tor/src/opnsense/service/templates/OPNsense/Tor/tor
rename to security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
diff --git a/net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc b/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
similarity index 100%
rename from net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
rename to security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc