diff --git a/Discovery/Web-Content/IIS.fuzz.txt b/Discovery/Web-Content/IIS.fuzz.txt
index aa39c303..c4b1552d 100644
--- a/Discovery/Web-Content/IIS.fuzz.txt
+++ b/Discovery/Web-Content/IIS.fuzz.txt
@@ -15,8 +15,10 @@
 /AdvWorks/equipment/catalog_type.asp
 /ajfhasdfgsagfakjhgd
 /archi~1/
+/archiv~1/
 /Archi~1/
 /aspnet_files/
+/aspnet_client/
 /asp/
 /asps/
 /ASPSamp/AdvWorks/equipment/catalog_type.asp
@@ -28,7 +30,8 @@
 /certsrv/
 /cfide/..%255c..%255c..%255c..%255cwinnt/system32/cmd.exe?/c+dir
 /CFIDE/Administrator/startstop.html
-/cgi
+/cgi/
+/cgi-bin/
 /cgi-bin/a1stats/a1disp.cgi
 /cgi-bin/htimage.exe?2,2
 /cgi-bin/htmlscript
@@ -42,6 +45,8 @@
 /Citrix/PNAgent/config.xml
 /clocktower
 /cmsample/
+/common/
+/common~1/
 /db/
 /domcfg.nsf/?open
 /Exadmin/
@@ -51,6 +56,7 @@
 /forum_arc.asp
 /forum.asp
 /forum_professionnel.asp
+/fpsample/
 /help/
 /iiasdmpwd/
 /iisadmin/
@@ -72,10 +78,13 @@
 /iissamples/sdk/asp/docs/codebrw2.asp
 /iissamples/sdk/asp/docs/codebrws.asp
 /iissamples/sdk/asp/docs/CodeBrws.asp
+/images/
 /imprimer.asp
 /includes/adovbs.inc
 /index.php
 /index.shtml
+/inetpub/
+/inetsrv/
 /isapi/
 /_layouts/alllibs.htm
 /_layouts/settings.htm
@@ -99,9 +108,11 @@
 /null.htw?CiWebHitsFile=/default.asp%20&CiRestriction=none&CiHilite
 /OMA/
 /OWA/
+/pbserver/
 /pbserver/pbserver.dll
 /postinfo.html
 /.printer
+/printers/
 /_private
 /progra~1
 /Progra~1
@@ -125,11 +136,15 @@
 /scripts/iisadmin/ism.dll?http/dir
 /scripts/no-such-file.pl
 /scripts/root.exe?/c+dir
+/scripts/samples/
 /scripts/samples/search/webhits.exe
+/scripts/tools/
 /scripts/tools/getdrvs.exe
 /scripts/tools/newdsn.exe
 /search?NS-query-pat=..\..\..\..\..\boot.ini
 /share/
+/sites/
+/siteserver/
 /SiteServer/Admin
 /SiteServer/Admin/commerce/foundation/driver.asp
 /SiteServer/Admin/commerce/foundation/DSN.asp
@@ -143,6 +158,8 @@
 /Sites/Samples/Knowledge/Membership/Inspired/ViewCode.asp
 /Sites/Samples/Knowledge/Push/ViewCode.asp
 /Sites/Samples/Knowledge/Search/ViewCode.asp
+/system/
+/system_web/
 /test/
 /tools/newdsn.exe?driver=Microsoft%2BAccess%2BDriver%2B%28*.mdb%29&dsn=goatfart+samples+from+microsoft&dbq=..%2F..%2Fwwwroot%2goatfart.html&newdb=CREA
 /tsweb/
@@ -170,9 +187,13 @@
 /_vti_pvt/users.pwd
 /_vti_script
 /_vti_txt
+/web/
 /_WEB_INF/
 /WEB-INF/web.xml
 /WebSer~1
+/webpub/
+/winnt/
+/wwwroot/
 /x.cfm
 /x.htw
 /x.htx
diff --git a/Discovery/Web-Content/iis.txt b/Discovery/Web-Content/iis.txt
deleted file mode 100644
index a3335032..00000000
--- a/Discovery/Web-Content/iis.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Micros~1
-WebSer~1
-_mem_bin
-_private
-_vti_adm
-_vti_aut
-_vti_bin
-_vti_cnf
-_vti_log
-_vti_pvt
-_vti_script
-_vti_txt
-administration
-adsamples
-archiv~1
-asp
-aspnet_client
-asps
-bin
-bins
-cgi-bin
-cmsample
-common
-common~1
-db
-fpsample
-help
-iisadmin
-iisadmpwd
-iishelp
-iissamples
-images
-inetpub
-inetsrv
-isapi
-msadc
-pbserver
-printers
-progra~1
-samples
-scripts
-scripts 
-scripts/samples
-scripts/tools
-sites
-siteserver
-system
-system_web
-web
-webpub
-winnt
-wwwroot
-x.cfm
-x.htx
-x.ida
-x.idc
-x.idq
-x.pl
-x.shtml
diff --git a/Discovery/Web-Content/sunas.txt b/Discovery/Web-Content/sunas.txt
index e7bd1ed5..7c898a87 100644
--- a/Discovery/Web-Content/sunas.txt
+++ b/Discovery/Web-Content/sunas.txt
@@ -49,4 +49,3 @@ BasicAuthServlet
 com.netscape.server.servlet.jsp.JSPRunner
 servlet
 classes
-