diff --git a/Discovery/Web_Content/flyspray-1.0RC4.txt b/Discovery/Web-Content/CMS/flyspray-1.0RC4.txt
similarity index 100%
rename from Discovery/Web_Content/flyspray-1.0RC4.txt
rename to Discovery/Web-Content/CMS/flyspray-1.0RC4.txt
diff --git a/Discovery/Web_Content/piwik-3.0.4.txt b/Discovery/Web-Content/CMS/piwik-3.0.4.txt
similarity index 100%
rename from Discovery/Web_Content/piwik-3.0.4.txt
rename to Discovery/Web-Content/CMS/piwik-3.0.4.txt
diff --git a/Discovery/JavaScript Miners b/Discovery/Web-Content/JavaScript-Miners.txt
similarity index 100%
rename from Discovery/JavaScript Miners
rename to Discovery/Web-Content/JavaScript-Miners.txt
diff --git a/Discovery/PublicSourceRepoIssues.txt b/Discovery/Web-Content/Public-Source-Repo-Issues.txt
similarity index 100%
rename from Discovery/PublicSourceRepoIssues.txt
rename to Discovery/Web-Content/Public-Source-Repo-Issues.txt
diff --git a/Discovery/Web_Content/MAZEN160_COMMON_API_ENDPOINTS.txt b/Discovery/Web-Content/common-api-endpoints-mazen160.txt
similarity index 100%
rename from Discovery/Web_Content/MAZEN160_COMMON_API_ENDPOINTS.txt
rename to Discovery/Web-Content/common-api-endpoints-mazen160.txt
diff --git a/Passwords/ff_bruteforce.txt b/Passwords/Honeypot-Captures/passwords-bruteforced-fabian-fingerle.de.txt
similarity index 100%
rename from Passwords/ff_bruteforce.txt
rename to Passwords/Honeypot-Captures/passwords-bruteforced-fabian-fingerle.de.txt
diff --git a/Passwords/KeyboardCombinations.txt b/Passwords/Keyboard-Combinations.txt
similarity index 100%
rename from Passwords/KeyboardCombinations.txt
rename to Passwords/Keyboard-Combinations.txt
diff --git a/Passwords/MostPopularLetterPasses.txt b/Passwords/Most-Popular-Letter-Passes.txt
similarity index 100%
rename from Passwords/MostPopularLetterPasses.txt
rename to Passwords/Most-Popular-Letter-Passes.txt
diff --git a/Passwords/Top447-WPA-probable-v2.txt b/Passwords/WiFi-WPA/probable-v2-wpa-top447.txt
similarity index 100%
rename from Passwords/Top447-WPA-probable-v2.txt
rename to Passwords/WiFi-WPA/probable-v2-wpa-top447.txt
diff --git a/Passwords/Top4800-WPA-probable-v2.txt b/Passwords/WiFi-WPA/probable-v2-wpa-top4800.txt
similarity index 100%
rename from Passwords/Top4800-WPA-probable-v2.txt
rename to Passwords/WiFi-WPA/probable-v2-wpa-top4800.txt
diff --git a/Passwords/Top62-WPA-probable-v2.txt b/Passwords/WiFi-WPA/probable-v2-wpa-top62.txt
similarity index 100%
rename from Passwords/Top62-WPA-probable-v2.txt
rename to Passwords/WiFi-WPA/probable-v2-wpa-top62.txt
diff --git a/Passwords/darkweb2017_top10.txt b/Passwords/darkweb2017-top10.txt
similarity index 100%
rename from Passwords/darkweb2017_top10.txt
rename to Passwords/darkweb2017-top10.txt
diff --git a/Passwords/darkweb2017_top100.txt b/Passwords/darkweb2017-top100.txt
similarity index 100%
rename from Passwords/darkweb2017_top100.txt
rename to Passwords/darkweb2017-top100.txt
diff --git a/Passwords/darkweb2017_top10K.txt b/Passwords/darkweb2017-top10K.txt
similarity index 100%
rename from Passwords/darkweb2017_top10K.txt
rename to Passwords/darkweb2017-top10K.txt
diff --git a/Passwords/darkweb2017_top1K.txt b/Passwords/darkweb2017-top1K.txt
similarity index 100%
rename from Passwords/darkweb2017_top1K.txt
rename to Passwords/darkweb2017-top1K.txt
diff --git a/Passwords/Top12Thousand-probable-v2.txt b/Passwords/probable-v2-top12000.txt
similarity index 100%
rename from Passwords/Top12Thousand-probable-v2.txt
rename to Passwords/probable-v2-top12000.txt
diff --git a/Passwords/Top1575-probable-v2.txt b/Passwords/probable-v2-top1575.txt
similarity index 100%
rename from Passwords/Top1575-probable-v2.txt
rename to Passwords/probable-v2-top1575.txt
diff --git a/Passwords/Top207-probable-v2.txt b/Passwords/probable-v2-top207.txt
similarity index 100%
rename from Passwords/Top207-probable-v2.txt
rename to Passwords/probable-v2-top207.txt
diff --git a/Passwords/ContaAzul.txt b/Passwords/unkown-azul.txt
similarity index 100%
rename from Passwords/ContaAzul.txt
rename to Passwords/unkown-azul.txt
diff --git a/Pattern_Matching/php_auditing b/Pattern-Matching/php-auditing.txt
similarity index 100%
rename from Pattern_Matching/php_auditing
rename to Pattern-Matching/php-auditing.txt
diff --git a/Usernames/ff_bruteforce.txt b/Usernames/Honeypot-Captures/users-bruteforced-fabian-fingerle.de.txt
similarity index 100%
rename from Usernames/ff_bruteforce.txt
rename to Usernames/Honeypot-Captures/users-bruteforced-fabian-fingerle.de.txt