diff --git a/Fuzzing/COMMIX-INJECT-HERE.txt b/Fuzzing/Command-Injection-commix.txt
similarity index 100%
rename from Fuzzing/COMMIX-INJECT-HERE.txt
rename to Fuzzing/Command-Injection-commix.txt
diff --git a/Fuzzing/FUZZDB-DB2Enumeration.txt b/Fuzzing/DB2Enumeration.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-DB2Enumeration.txt
rename to Fuzzing/DB2Enumeration.fuzzdb.txt
diff --git a/Fuzzing/JHADDIX-FORMATSTRING.txt b/Fuzzing/FORMATSTRING-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-FORMATSTRING.txt
rename to Fuzzing/FORMATSTRING-JHADDIX.txt
diff --git a/Fuzzing/SKULLSECURITY-FuzzingStrings.txt b/Fuzzing/FuzzingStrings-SKULLSECURITY.txt
similarity index 100%
rename from Fuzzing/SKULLSECURITY-FuzzingStrings.txt
rename to Fuzzing/FuzzingStrings-SKULLSECURITY.txt
diff --git a/Fuzzing/FUZZDB-GenericBlind.txt b/Fuzzing/GenericBlind.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-GenericBlind.txt
rename to Fuzzing/GenericBlind.fuzzdb.txt
diff --git a/Fuzzing/JHADDIX-HTML5sec-Injections.txt b/Fuzzing/HTML5sec-Injections-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-HTML5sec-Injections.txt
rename to Fuzzing/HTML5sec-Injections-JHADDIX.txt
diff --git a/Fuzzing/JSON-Fuzzing.txt b/Fuzzing/JSON.Fuzzing.txt
similarity index 100%
rename from Fuzzing/JSON-Fuzzing.txt
rename to Fuzzing/JSON.Fuzzing.txt
diff --git a/Fuzzing/LDAP-FUZZ.txt b/Fuzzing/LDAP.Fuzzinging.txt
similarity index 100%
rename from Fuzzing/LDAP-FUZZ.txt
rename to Fuzzing/LDAP.Fuzzinging.txt
diff --git a/Fuzzing/JHADDIX-LFI.txt b/Fuzzing/LFI-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-LFI.txt
rename to Fuzzing/LFI-JHADDIX.txt
diff --git a/Fuzzing/FUZZDB-MSSQLEnumeration.txt b/Fuzzing/MSSQL-Enumeration.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-MSSQLEnumeration.txt
rename to Fuzzing/MSSQL-Enumeration.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-MSSQL.txt b/Fuzzing/MSSQL.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-MSSQL.txt
rename to Fuzzing/MSSQL.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-MYSQL.txt b/Fuzzing/MYSQL.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-MYSQL.txt
rename to Fuzzing/MYSQL.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-Metacharacters.txt b/Fuzzing/Metacharacters.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-Metacharacters.txt
rename to Fuzzing/Metacharacters.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-MySQL-ReadLocalFiles.txt b/Fuzzing/MySQL-Read-Local-Files.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-MySQL-ReadLocalFiles.txt
rename to Fuzzing/MySQL-Read-Local-Files.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-MySQL-SQLi-LoginBypass.txt b/Fuzzing/MySQL-SQLi-Login-Bypass.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-MySQL-SQLi-LoginBypass.txt
rename to Fuzzing/MySQL-SQLi-Login-Bypass.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-Oracle.txt b/Fuzzing/Oracle.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-Oracle.txt
rename to Fuzzing/Oracle.fuzzdb.txt
diff --git a/Fuzzing/0xsobky-UltimateXSSPolyglot.txt b/Fuzzing/Polyglots/Ultimate-XSS-Polyglot-0xsobky.txt
similarity index 100%
rename from Fuzzing/0xsobky-UltimateXSSPolyglot.txt
rename to Fuzzing/Polyglots/Ultimate-XSS-Polyglot-0xsobky.txt
diff --git a/Fuzzing/FUZZDB-PostgresEnumeration.txt b/Fuzzing/Postgres-Enumeration.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-PostgresEnumeration.txt
rename to Fuzzing/Postgres-Enumeration.fuzzdb.txt
diff --git a/Fuzzing/JHADDIX-SSI-Injection.txt b/Fuzzing/SSI-Injection-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-SSI-Injection.txt
rename to Fuzzing/SSI-Injection-JHADDIX.txt
diff --git a/Fuzzing/FUZZDB-URIXSS.txt b/Fuzzing/URI-XSS.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-URIXSS.txt
rename to Fuzzing/URI-XSS.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-UnixAttacks.txt b/Fuzzing/UnixAttacks.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-UnixAttacks.txt
rename to Fuzzing/UnixAttacks.fuzzdb.txt
diff --git a/Fuzzing/FUZZDB-WindowsAattacks.txt b/Fuzzing/Windows-Attacks.fuzzdb.txt
similarity index 100%
rename from Fuzzing/FUZZDB-WindowsAattacks.txt
rename to Fuzzing/Windows-Attacks.fuzzdb.txt
diff --git a/Fuzzing/BRUTELOGIC-XSS-BYPASS-STRINGS.txt b/Fuzzing/XSS-BYPASS-STRINGS-BRUTELOGIC.txt
similarity index 100%
rename from Fuzzing/BRUTELOGIC-XSS-BYPASS-STRINGS.txt
rename to Fuzzing/XSS-BYPASS-STRINGS-BRUTELOGIC.txt
diff --git a/Fuzzing/JHADDIX-XSS.txt b/Fuzzing/XSS-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-XSS.txt
rename to Fuzzing/XSS-JHADDIX.txt
diff --git a/Fuzzing/RSNAKE-XSS.txt b/Fuzzing/XSS-RSNAKE-.txt
similarity index 100%
rename from Fuzzing/RSNAKE-XSS.txt
rename to Fuzzing/XSS-RSNAKE-.txt
diff --git a/Fuzzing/BRUTELOGIC-XSS-STRINGS.txt b/Fuzzing/XSS-STRINGS-BRUTELOGIC.txt
similarity index 100%
rename from Fuzzing/BRUTELOGIC-XSS-STRINGS.txt
rename to Fuzzing/XSS-STRINGS-BRUTELOGIC.txt
diff --git a/Fuzzing/JHADDIX-XSS-WITH-CONTEXT.txt b/Fuzzing/XSS-WITH-CONTEXT-JHADDIX.txt
similarity index 100%
rename from Fuzzing/JHADDIX-XSS-WITH-CONTEXT.txt
rename to Fuzzing/XSS-WITH-CONTEXT-JHADDIX.txt
diff --git a/Fuzzing/MarioXSSVectors.txt b/Fuzzing/XSSVectors-Mario.txt
similarity index 100%
rename from Fuzzing/MarioXSSVectors.txt
rename to Fuzzing/XSSVectors-Mario.txt
diff --git a/Fuzzing/test-ext.txt b/Fuzzing/extension-test.txt
similarity index 100%
rename from Fuzzing/test-ext.txt
rename to Fuzzing/extension-test.txt
diff --git a/Passwords/mil-dic.txt b/Passwords/Cracked-Hashes/milw0rm-dictionary.txt
similarity index 100%
rename from Passwords/mil-dic.txt
rename to Passwords/Cracked-Hashes/milw0rm-dictionary.txt
diff --git a/Passwords/Honeypot-Captures/passwords-bruteforced-fabian-fingerle.de.txt b/Passwords/Honeypot-Captures/multiplesources-passwords-fabian-fingerle.de.txt
similarity index 100%
rename from Passwords/Honeypot-Captures/passwords-bruteforced-fabian-fingerle.de.txt
rename to Passwords/Honeypot-Captures/multiplesources-passwords-fabian-fingerle.de.txt
diff --git a/Passwords/wordpress-attacks-july2014.txt b/Passwords/Honeypot-Captures/wordpress-attacks-july2014.txt
similarity index 100%
rename from Passwords/wordpress-attacks-july2014.txt
rename to Passwords/Honeypot-Captures/wordpress-attacks-july2014.txt
diff --git a/Passwords/passwords-clarkson-82.txt b/Passwords/clarkson-university-82.txt
similarity index 100%
rename from Passwords/passwords-clarkson-82.txt
rename to Passwords/clarkson-university-82.txt
diff --git a/Passwords/openwall-all.txt b/Passwords/openwall.net-all.txt
similarity index 100%
rename from Passwords/openwall-all.txt
rename to Passwords/openwall.net-all.txt
diff --git a/Usernames/Honeypot-Captures/users-bruteforced-fabian-fingerle.de.txt b/Usernames/Honeypot-Captures/multiplesources-users-fabian-fingerle.de.txt
similarity index 100%
rename from Usernames/Honeypot-Captures/users-bruteforced-fabian-fingerle.de.txt
rename to Usernames/Honeypot-Captures/multiplesources-users-fabian-fingerle.de.txt