diff --git a/conf/keywords.cfg b/conf/keywords.cfg
index 472a015..667a080 100644
--- a/conf/keywords.cfg
+++ b/conf/keywords.cfg
@@ -1,4 +1,4 @@
-#EMAIL REGEX (?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])
+(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])
 0wn3d
 0wned
 anonymous
diff --git a/defacement_check.pl b/defacement_check.pl
index df9152e..2087ec6 100644
--- a/defacement_check.pl
+++ b/defacement_check.pl
@@ -28,17 +28,19 @@ if (open(my $f, '<:encoding(UTF-8)', $keywords)) {
   warn "Could not open file '$keywords' $!";
 }
 
-# Open TXT files
-my @files = glob( "urls/*.txt" );
+# Open URLS files
+my @files = glob( "urls/*.urls" );
 my $file;
+my $somme_total_found = 0;
+my $grand_total_found = 0;
 
 foreach $file (@files)
 {
   my @urls;
   my $url;
   my $somme_total_found = 0;
-  open(TXT, '<', $file) or die $!;
-  while(<TXT>){
+  open(FH, '<', $file) or die $!;
+  while(<FH>){
     my $url = $_;
     my $survey = $url;
     # Create a user agent object
@@ -68,9 +70,12 @@ foreach $file (@files)
       print "\033[32m[" . $total_found . "]\t\t=> " . $survey. "\n";
     } else {
       print "\033[31mTREATH [" . $total_found . "]\t=> " . $survey. "\n";
+      $somme_total_found = $somme_total_found + $total_found;
     }
-    my $somme_total_found = $somme_total_found + $total_found;
   }
-  close(TXT);
-  print "\033[36mTotal TREATH detected \t\t=> [" . $somme_total_found . "]\n\n";
+  close(FH);
+  print "\033[36mTotal TREATH detected on this website \t\t=> [" . $somme_total_found . "]\n\n";
+  $grand_total_found = $somme_total_found + $grand_total_found;
 }
+
+print "\033[36mGrand Total TREATH detected on all website \t\t=> [" . $grand_total_found . "]\n\n";
diff --git a/urls/urls_example.com.txt b/urls/example.com.urls
similarity index 100%
rename from urls/urls_example.com.txt
rename to urls/example.com.urls
diff --git a/urls/slurp_urls.sh b/urls/slurp_urls.sh
index f5fcd65..a5c448b 100644
--- a/urls/slurp_urls.sh
+++ b/urls/slurp_urls.sh
@@ -2,10 +2,10 @@
 echo "Slurping URLs ..."
 echo
 sitedomain=$1
-wget --spider --recursive --level=inf --no-verbose --output-file=get_urls.txt $sitedomain
-grep -i URL get_urls.txt | awk -F 'URL:' '{print $2}' | awk '{$1=$1};1' | awk '{print $1}' | sort -u | sed '/^$/d' > urls_$sitedomain.txt
-rm get_urls.txt
+wget --spider --recursive --level=inf --no-verbose --output-file=geturls.tmp $sitedomain
+grep -i URL geturls.tmp | awk -F 'URL:' '{print $2}' | awk '{$1=$1};1' | awk '{print $1}' | sort -u | sed '/^$/d' > $sitedomain.urls
+rm geturls.tmp
 rm -r $sitedomain
 echo "Done !"
 echo
-ls -lArth | grep urls_$sitedomain.txt
+ls -lArth | grep *.urls
diff --git a/urls/urls_www.aoc-toiture.com.txt b/urls/urls_www.aoc-toiture.com.txt
deleted file mode 100644
index 1389692..0000000
--- a/urls/urls_www.aoc-toiture.com.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-http://www.aoc-toiture.com/
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=19&pos=1&numid=1
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=19&pos=2&numid=2
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=19&pos=3&numid=3
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=19&pos=4&numid=4
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=20&pos=1&numid=5
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=20&pos=2&numid=6
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=20&pos=3&numid=7
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=20&pos=4&numid=8
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=21&pos=1&numid=9
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=21&pos=2&numid=10
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=21&pos=3&numid=11
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=21&pos=4&numid=12
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=22&pos=1&numid=13
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=22&pos=2&numid=14
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=22&pos=3&numid=15
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=22&pos=4&numid=16
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=23&pos=1&numid=17
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=23&pos=2&numid=18
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=23&pos=3&numid=19
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=23&pos=4&numid=20
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=24&pos=1&numid=21
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=24&pos=2&numid=22
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=24&pos=3&numid=23
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=24&pos=4&numid=24
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=25&pos=1&numid=25
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=25&pos=2&numid=26
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=25&pos=3&numid=27
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=25&pos=4&numid=28
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=26&pos=1&numid=29
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=26&pos=2&numid=30
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=26&pos=3&numid=31
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=26&pos=4&numid=32
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=27&pos=1&numid=33
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=27&pos=2&numid=34
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=27&pos=3&numid=35
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=27&pos=4&numid=36
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=28&pos=1&numid=37
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=28&pos=2&numid=38
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=28&pos=3&numid=39
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=28&pos=4&numid=40
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=29&pos=1&numid=41
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=29&pos=2&numid=42
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=29&pos=3&numid=43
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=29&pos=4&numid=44
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=30&pos=1&numid=45
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=30&pos=2&numid=46
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=30&pos=3&numid=47
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=30&pos=4&numid=48
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=31&pos=1&numid=49
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=31&pos=2&numid=50
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=31&pos=3&numid=51
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=31&pos=4&numid=52
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=32&pos=1&numid=53
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=32&pos=2&numid=54
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=32&pos=3&numid=55
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=32&pos=4&numid=56
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=33&pos=1&numid=57
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=33&pos=2&numid=58
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=33&pos=3&numid=59
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=33&pos=4&numid=60
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=34&pos=1&numid=61
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=34&pos=2&numid=62
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=34&pos=3&numid=63
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=34&pos=4&numid=64
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=35&pos=1&numid=65
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=35&pos=2&numid=66
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=35&pos=3&numid=67
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=35&pos=4&numid=68
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=36&pos=1&numid=69
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=36&pos=2&numid=70
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=36&pos=3&numid=71
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=36&pos=4&numid=72
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=37&pos=1&numid=73
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=37&pos=2&numid=74
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=37&pos=3&numid=75
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=37&pos=4&numid=76
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=38&pos=1&numid=77
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=38&pos=2&numid=78
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=38&pos=3&numid=79
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=38&pos=4&numid=80
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=39&pos=1&numid=81
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=39&pos=2&numid=82
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=39&pos=3&numid=83
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=39&pos=4&numid=84
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=40&pos=1&numid=85
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=40&pos=2&numid=86
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=40&pos=3&numid=87
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=40&pos=4&numid=88
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=41&pos=1&numid=89
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=41&pos=2&numid=90
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=41&pos=3&numid=91
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=41&pos=4&numid=92
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=42&pos=1&numid=93
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=42&pos=2&numid=94
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=42&pos=3&numid=95
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=42&pos=4&numid=96
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=46&pos=1&numid=101
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=46&pos=2&numid=102
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=46&pos=3&numid=103
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=46&pos=4&numid=104
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=48&pos=1&numid=97
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=48&pos=2&numid=98
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=48&pos=3&numid=99
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=48&pos=4&numid=100
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=49&pos=1&numid=105
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=49&pos=2&numid=106
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=49&pos=3&numid=107
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=49&pos=4&numid=108
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=50&pos=1&numid=109
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=50&pos=2&numid=110
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=50&pos=3&numid=111
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=50&pos=4&numid=112
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=51&pos=1&numid=113
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=51&pos=2&numid=114
-http://www.aoc-toiture.com/detail_galerie.php?pg=8&numgal=51&pos=3&numid=115
-http://www.aoc-toiture.com/index.php?pg=1
-http://www.aoc-toiture.com/index.php?pg=11
-http://www.aoc-toiture.com/index.php?pg=13
-http://www.aoc-toiture.com/index.php?pg=14
-http://www.aoc-toiture.com/index.php?pg=2
-http://www.aoc-toiture.com/index.php?pg=3
-http://www.aoc-toiture.com/index.php?pg=4
-http://www.aoc-toiture.com/index.php?pg=5
-http://www.aoc-toiture.com/index.php?pg=6
-http://www.aoc-toiture.com/index.php?pg=8
-http://www.aoc-toiture.com/index.php?pg=9
diff --git a/urls/urls_www.firewall-services.com.txt b/urls/www.firewall-services.com.urls
similarity index 100%
rename from urls/urls_www.firewall-services.com.txt
rename to urls/www.firewall-services.com.urls
diff --git a/urls/urls_www.perl.org.txt b/urls/www.perl.org.urls
similarity index 100%
rename from urls/urls_www.perl.org.txt
rename to urls/www.perl.org.urls