diff --git a/exposures/default/default-apache-test-page.yaml b/technologies/default-apache-test-page.yaml
similarity index 85%
rename from exposures/default/default-apache-test-page.yaml
rename to technologies/default-apache-test-page.yaml
index 16ba920347..f727151d6a 100644
--- a/exposures/default/default-apache-test-page.yaml
+++ b/technologies/default-apache-test-page.yaml
@@ -3,16 +3,17 @@ id: default-apache-test-page
 info:
   name: Apache HTTP Server Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,apache
   reference: https://www.shodan.io/search?query=http.title%3A%22Apache+HTTP+Server+Test+Page+powered+by+CentOS%22
 
 requests:
   - method: GET
     path:
       - '{{BaseURL}}'
+
     matchers:
       - type: word
         words:
           - "<title>Apache HTTP Server Test Page powered by CentOS</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-apache2-page.yaml b/technologies/default-apache2-page.yaml
similarity index 85%
rename from exposures/default/default-apache2-page.yaml
rename to technologies/default-apache2-page.yaml
index 5573fe8871..5b0059bd91 100644
--- a/exposures/default/default-apache2-page.yaml
+++ b/technologies/default-apache2-page.yaml
@@ -3,16 +3,17 @@ id: default-apache2-page
 info:
   name: Apache2 Default Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,apache
   reference: https://www.shodan.io/search?query=http.title%3A%22Apache2+Debian+Default+Page%3A+It+works%22
 
 requests:
   - method: GET
     path:
       - '{{BaseURL}}'
+
     matchers:
       - type: word
         words:
           - "<title>Apache2 Debian Default Page: It works</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-apache2-ubuntu-page.yaml b/technologies/default-apache2-ubuntu-page.yaml
similarity index 85%
rename from exposures/default/default-apache2-ubuntu-page.yaml
rename to technologies/default-apache2-ubuntu-page.yaml
index 8541a79100..3c97cba742 100644
--- a/exposures/default/default-apache2-ubuntu-page.yaml
+++ b/technologies/default-apache2-ubuntu-page.yaml
@@ -3,8 +3,8 @@ id: default-apache2-ubuntu-page
 info:
   name: Apache2 Ubuntu Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,apache
   reference: https://www.shodan.io/search?query=http.title%3A%22Apache2+Ubuntu+Default+Page%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Apache2 Ubuntu Default Page: It works</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-asp.net-page.yaml b/technologies/default-asp.net-page.yaml
similarity index 84%
rename from exposures/default/default-asp.net-page.yaml
rename to technologies/default-asp.net-page.yaml
index 5f28cbd648..8aaa46e76f 100644
--- a/exposures/default/default-asp.net-page.yaml
+++ b/technologies/default-asp.net-page.yaml
@@ -3,8 +3,8 @@ id: default-asp.net-page
 info:
   name: ASP.Net Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,asp
   reference: https://www.shodan.io/search?query=http.title%3A%22Home+Page+-+My+ASP.NET+Application%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "Home Page - My ASP.NET Application"
-        condition: and
+        part: body
diff --git a/exposures/default/default-centos-test-page.yaml b/technologies/default-centos-test-page.yaml
similarity index 86%
rename from exposures/default/default-centos-test-page.yaml
rename to technologies/default-centos-test-page.yaml
index 625b40c2b5..dc7bbd3cb4 100644
--- a/exposures/default/default-centos-test-page.yaml
+++ b/technologies/default-centos-test-page.yaml
@@ -3,8 +3,8 @@ id: default-centos-test-page
 info:
   name: CentOs-WebPanel Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,centos
   reference: https://www.shodan.io/search?query=http.title%3A%22HTTP+Server+Test+Page+powered+by+CentOS-WebPanel.com%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>HTTP Server Test Page powered by CentOS-WebPanel.com</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-django-page.yaml b/technologies/default-django-page.yaml
similarity index 85%
rename from exposures/default/default-django-page.yaml
rename to technologies/default-django-page.yaml
index dfaa849958..bcf0fa6fc0 100644
--- a/exposures/default/default-django-page.yaml
+++ b/technologies/default-django-page.yaml
@@ -3,8 +3,8 @@ id: default-django-page
 info:
   name: Django Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,django
   reference: https://www.shodan.io/search?query=http.title%3A%22The+install+worked+successfully%21+Congratulations%21%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>The install worked successfully! Congratulations!</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-fastcgi-page.yaml b/technologies/default-fastcgi-page.yaml
similarity index 83%
rename from exposures/default/default-fastcgi-page.yaml
rename to technologies/default-fastcgi-page.yaml
index 72d0825a89..e88c4819e2 100644
--- a/exposures/default/default-fastcgi-page.yaml
+++ b/technologies/default-fastcgi-page.yaml
@@ -3,8 +3,8 @@ id: default-fastcgi-page
 info:
   name: Fastcgi Default Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,fastcgi
   reference: https://www.shodan.io/search?query=http.title%3A%22FastCGI%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>TurnKey NGINX PHP FastCGI Server</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-fedora-page.yaml b/technologies/default-fedora-page.yaml
similarity index 85%
rename from exposures/default/default-fedora-page.yaml
rename to technologies/default-fedora-page.yaml
index 064985f80b..7e2b986ddf 100644
--- a/exposures/default/default-fedora-page.yaml
+++ b/technologies/default-fedora-page.yaml
@@ -3,8 +3,8 @@ id: default-fedora-page
 info:
   name: Fedora Default Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,fedora
   reference: https://www.shodan.io/search?query=http.title%3A%22Test+Page+for+the+HTTP+Server+on+Fedora%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - '<title>Test Page for the HTTP Server on Fedora</title>'
-        condition: and
+        part: body
diff --git a/exposures/default/default-glassfish-server-page.yaml b/technologies/default-glassfish-server-page.yaml
similarity index 85%
rename from exposures/default/default-glassfish-server-page.yaml
rename to technologies/default-glassfish-server-page.yaml
index 1c07b607c3..1c6c19e8ea 100644
--- a/exposures/default/default-glassfish-server-page.yaml
+++ b/technologies/default-glassfish-server-page.yaml
@@ -3,8 +3,8 @@ id: default-glassfish-server-page
 info:
   name: GlassFish Server Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,glassfish
   reference: https://www.shodan.io/search?query=http.title%3A%22GlassFish+Server+-+Server+Running%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>GlassFish Server - Server Running</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-iis7-page.yaml b/technologies/default-iis7-page.yaml
similarity index 81%
rename from exposures/default/default-iis7-page.yaml
rename to technologies/default-iis7-page.yaml
index 30fe69635f..2e826ee434 100644
--- a/exposures/default/default-iis7-page.yaml
+++ b/technologies/default-iis7-page.yaml
@@ -3,8 +3,8 @@ id: default-iis7-page
 info:
   name: IIS-7 Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,iis
   reference: https://www.shodan.io/search?query=http.title%3A%22IIS7%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>IIS7</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-jetty-page.yaml b/technologies/default-jetty-page.yaml
similarity index 83%
rename from exposures/default/default-jetty-page.yaml
rename to technologies/default-jetty-page.yaml
index d5a9861bc5..40954ebd9c 100644
--- a/exposures/default/default-jetty-page.yaml
+++ b/technologies/default-jetty-page.yaml
@@ -3,8 +3,8 @@ id: default-jetty-page
 info:
   name: Jetty Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,jetty
   reference: https://www.shodan.io/search?query=http.title%3A%22Powered+By+Jetty%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<TITLE>Powered By Jetty</TITLE>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-microsoft-azure-page.yaml b/technologies/default-microsoft-azure-page.yaml
similarity index 85%
rename from exposures/default/default-microsoft-azure-page.yaml
rename to technologies/default-microsoft-azure-page.yaml
index 158c4c2a51..0188209aab 100644
--- a/exposures/default/default-microsoft-azure-page.yaml
+++ b/technologies/default-microsoft-azure-page.yaml
@@ -3,8 +3,8 @@ id: default-microsoft-azure-page
 info:
   name: Microsoft Azure Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,azure,microsoft
   reference: https://www.shodan.io/search?query=http.title%3A%22Microsoft+Azure+App+Service+-+Welcome%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Microsoft Azure App Service - Welcome</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-nginx-page.yaml b/technologies/default-nginx-page.yaml
similarity index 83%
rename from exposures/default/default-nginx-page.yaml
rename to technologies/default-nginx-page.yaml
index 260988e7d2..9c6cded178 100644
--- a/exposures/default/default-nginx-page.yaml
+++ b/technologies/default-nginx-page.yaml
@@ -3,8 +3,8 @@ id: default-nginx-page
 info:
   name: Nginx Default Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,nginx
   reference: https://www.shodan.io/search?query=http.title%3A%22Welcome+to+nginx%21%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Welcome to nginx!</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-oracle-application-page.yaml b/technologies/default-oracle-application-page.yaml
similarity index 86%
rename from exposures/default/default-oracle-application-page.yaml
rename to technologies/default-oracle-application-page.yaml
index 5f084e1b82..263c5493f5 100644
--- a/exposures/default/default-oracle-application-page.yaml
+++ b/technologies/default-oracle-application-page.yaml
@@ -3,8 +3,8 @@ id: default-oracle-application-page
 info:
   name: Oracle Application Server Containers
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,oracle
   reference: https://www.shodan.io/search?query=http.title%3A%22Oracle+Application+Server+Containers%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<TITLE>Oracle Application Server Containers for J2EE 10g</TITLE>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-payara-server-page.yaml b/technologies/default-payara-server-page.yaml
similarity index 84%
rename from exposures/default/default-payara-server-page.yaml
rename to technologies/default-payara-server-page.yaml
index bee6182a7d..df15d841b4 100644
--- a/exposures/default/default-payara-server-page.yaml
+++ b/technologies/default-payara-server-page.yaml
@@ -3,8 +3,8 @@ id: default-payara-server-page
 info:
   name: Payara Server Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,payara
   reference: https://www.shodan.io/search?query=http.title%3A%22Payara+Server+-+Server+Running%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Payara Server - Server Running</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-plesk-page.yaml b/technologies/default-plesk-page.yaml
similarity index 84%
rename from exposures/default/default-plesk-page.yaml
rename to technologies/default-plesk-page.yaml
index d89cbb26f4..1de2c79c92 100644
--- a/exposures/default/default-plesk-page.yaml
+++ b/technologies/default-plesk-page.yaml
@@ -3,8 +3,8 @@ id: default-plesk-page
 info:
   name: Plesk Default Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,plesk
   reference: https://www.shodan.io/search?query=http.title%3A%22Web+Server%27s+Default+Page%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Web Server's Default Page</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-redhat-test-page.yaml b/technologies/default-redhat-test-page.yaml
similarity index 87%
rename from exposures/default/default-redhat-test-page.yaml
rename to technologies/default-redhat-test-page.yaml
index fe591f31ab..e208dfba44 100644
--- a/exposures/default/default-redhat-test-page.yaml
+++ b/technologies/default-redhat-test-page.yaml
@@ -3,8 +3,8 @@ id: default-redhat-test-page
 info:
   name: Red Hat Enterprise Linux Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,redhat
   reference: https://www.shodan.io/search?query=http.title%3A%22Test+Page+for+the+Apache+HTTP+Server+on+Red+Hat+Enterprise+Linux%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-ssltls-test-page.yaml b/technologies/default-ssltls-test-page.yaml
similarity index 87%
rename from exposures/default/default-ssltls-test-page.yaml
rename to technologies/default-ssltls-test-page.yaml
index 595ac0748b..5110d71023 100644
--- a/exposures/default/default-ssltls-test-page.yaml
+++ b/technologies/default-ssltls-test-page.yaml
@@ -3,8 +3,8 @@ id: default-ssltls-test-page
 info:
   name: SSL/TLS-aware Test Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,ssltls
   reference: https://www.shodan.io/search?query=http.title%3A%22Test+Page+for+the+SSL%2FTLS-aware+Apache+Installation+on+Web+Site%22&page=2
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<TITLE>Test Page for the SSL/TLS-aware Apache Installation on Web Site</TITLE>"
-        condition: and
+        part: body
diff --git a/exposures/default/default-tomcat-page.yaml b/technologies/default-tomcat-page.yaml
similarity index 82%
rename from exposures/default/default-tomcat-page.yaml
rename to technologies/default-tomcat-page.yaml
index ba68acfef2..a73de15ed3 100644
--- a/exposures/default/default-tomcat-page.yaml
+++ b/technologies/default-tomcat-page.yaml
@@ -3,8 +3,8 @@ id: default-tomcat-page
 info:
   name: Tomcat Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,tomcat
   reference: https://www.shodan.io/search?query=http.title%3A%22Apache+Tomcat%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>Apache Tomcat"
-        condition: and
+        part: body
diff --git a/exposures/default/default-windows-server-page.yaml b/technologies/default-windows-server-page.yaml
similarity index 84%
rename from exposures/default/default-windows-server-page.yaml
rename to technologies/default-windows-server-page.yaml
index be9be411e9..fd6f6ecba8 100644
--- a/exposures/default/default-windows-server-page.yaml
+++ b/technologies/default-windows-server-page.yaml
@@ -3,8 +3,8 @@ id: default-windows-server-page
 info:
   name: IIS Windows Server Default Page
   author: dhiyaneshDk
-  severity: low
-  tags: default,exposure
+  severity: info
+  tags: tech,windows,iis
   reference: https://www.shodan.io/search?query=http.title%3A%22IIS+Windows+Server%22
 
 requests:
@@ -15,4 +15,4 @@ requests:
       - type: word
         words:
           - "<title>IIS Windows Server</title>"
-        condition: and
+        part: body