diff --git a/network/vsftpd-backdoor.yaml b/network/backdoor/vsftpd-backdoor.yaml
similarity index 100%
rename from network/vsftpd-backdoor.yaml
rename to network/backdoor/vsftpd-backdoor.yaml
diff --git a/network/ftp-anonymous-login.yaml b/network/default-login/ftp-anonymous-login.yaml
similarity index 100%
rename from network/ftp-anonymous-login.yaml
rename to network/default-login/ftp-anonymous-login.yaml
diff --git a/network/ftp-weak-credentials.yaml b/network/default-login/ftp-weak-credentials.yaml
similarity index 100%
rename from network/ftp-weak-credentials.yaml
rename to network/default-login/ftp-weak-credentials.yaml
diff --git a/network/detect-addpac-voip-gateway.yaml b/network/detection/detect-addpac-voip-gateway.yaml
similarity index 100%
rename from network/detect-addpac-voip-gateway.yaml
rename to network/detection/detect-addpac-voip-gateway.yaml
diff --git a/network/detect-jabber-xmpp.yaml b/network/detection/detect-jabber-xmpp.yaml
similarity index 100%
rename from network/detect-jabber-xmpp.yaml
rename to network/detection/detect-jabber-xmpp.yaml
diff --git a/network/expn-mail-detect.yaml b/network/detection/expn-mail-detect.yaml
similarity index 100%
rename from network/expn-mail-detect.yaml
rename to network/detection/expn-mail-detect.yaml
diff --git a/network/sap-router.yaml b/network/detection/sap-router.yaml
similarity index 100%
rename from network/sap-router.yaml
rename to network/detection/sap-router.yaml
diff --git a/network/cisco-smi-exposure.yaml b/network/exposures/cisco-smi-exposure.yaml
similarity index 100%
rename from network/cisco-smi-exposure.yaml
rename to network/exposures/cisco-smi-exposure.yaml
diff --git a/network/exposed-adb.yaml b/network/exposures/exposed-adb.yaml
similarity index 100%
rename from network/exposed-adb.yaml
rename to network/exposures/exposed-adb.yaml
diff --git a/network/exposed-dockerd.yaml b/network/exposures/exposed-dockerd.yaml
similarity index 100%
rename from network/exposed-dockerd.yaml
rename to network/exposures/exposed-dockerd.yaml
diff --git a/network/exposed-redis.yaml b/network/exposures/exposed-redis.yaml
similarity index 100%
rename from network/exposed-redis.yaml
rename to network/exposures/exposed-redis.yaml
diff --git a/network/exposed-zookeeper.yaml b/network/exposures/exposed-zookeeper.yaml
similarity index 100%
rename from network/exposed-zookeeper.yaml
rename to network/exposures/exposed-zookeeper.yaml
diff --git a/network/clamav-unauth.yaml b/network/misconfig/clamav-unauth.yaml
similarity index 100%
rename from network/clamav-unauth.yaml
rename to network/misconfig/clamav-unauth.yaml
diff --git a/network/clickhouse-unauth.yaml b/network/misconfig/clickhouse-unauth.yaml
similarity index 100%
rename from network/clickhouse-unauth.yaml
rename to network/misconfig/clickhouse-unauth.yaml
diff --git a/network/ganglia-xml-grid-monitor.yaml b/network/misconfig/ganglia-xml-grid-monitor.yaml
similarity index 100%
rename from network/ganglia-xml-grid-monitor.yaml
rename to network/misconfig/ganglia-xml-grid-monitor.yaml
diff --git a/network/memcached-stats.yaml b/network/misconfig/memcached-stats.yaml
similarity index 100%
rename from network/memcached-stats.yaml
rename to network/misconfig/memcached-stats.yaml
diff --git a/network/mongodb-unauth.yaml b/network/misconfig/mongodb-unauth.yaml
similarity index 100%
rename from network/mongodb-unauth.yaml
rename to network/misconfig/mongodb-unauth.yaml
diff --git a/network/mysql-native-password.yaml b/network/misconfig/mysql-native-password.yaml
similarity index 100%
rename from network/mysql-native-password.yaml
rename to network/misconfig/mysql-native-password.yaml
diff --git a/network/printers-info-leak.yaml b/network/misconfig/printers-info-leak.yaml
similarity index 100%
rename from network/printers-info-leak.yaml
rename to network/misconfig/printers-info-leak.yaml
diff --git a/network/sap-router-info-leak.yaml b/network/misconfig/sap-router-info-leak.yaml
similarity index 100%
rename from network/sap-router-info-leak.yaml
rename to network/misconfig/sap-router-info-leak.yaml
diff --git a/network/tidb-native-password.yaml b/network/misconfig/tidb-native-password.yaml
similarity index 100%
rename from network/tidb-native-password.yaml
rename to network/misconfig/tidb-native-password.yaml
diff --git a/network/tidb-unauth.yaml b/network/misconfig/tidb-unauth.yaml
similarity index 100%
rename from network/tidb-unauth.yaml
rename to network/misconfig/tidb-unauth.yaml