diff --git a/README.md b/README.md
index 72dcb9882..a3b2fb23f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,18 @@
-The Exploit Database Git Repository
-===================================
+# The Exploit Database Git Repository
+This is an official repository of [The Exploit Database](http://www.exploit-db.com/), a [project](https://www.offensive-security.com/community-projects/) sponsored by [Offensive Security](https://www.offensive-security.com/).
+Our repositories are:
 
-This is the official repository of [The Exploit Database](https://www.exploit-db.com/), a project sponsored by [Offensive Security](https://www.offensive-security.com/).
+  - Exploits & Shellcodes: [https://github.com/offensive-security/exploit-database](https://github.com/offensive-security/exploit-database)
+  - Binary Exploits: [https://github.com/offensive-security/exploit-database-bin-sploits](https://github.com/offensive-security/exploit-database-bin-sploits)
+  - Papers: [https://github.com/offensive-security/exploit-database-papers](https://github.com/offensive-security/exploit-database-papers)
 
-The Exploit Database is an archive of public exploits and corresponding vulnerable software, developed for use by penetration testers and vulnerability researchers. Its aim is to serve as the most comprehensive collection of exploits gathered through direct submissions, mailing lists, and other public sources, and present them in a freely-available and easy-to-navigate database. The Exploit Database is a repository for exploits and proof-of-concepts rather than advisories, making it a valuable resource for those who need actionable data right away.
+The Exploit Database is an archive of public exploits and corresponding vulnerable software, developed for use by penetration testers and vulnerability researchers. Its aim is to serve as the most comprehensive collection of [exploits](https://www.exploit-db.com/browse/), [shellcode](https://www.exploit-db.com/shellcode/) and [papers](https://www.exploit-db.com/papers/) gathered through direct submissions, mailing lists, and other public sources, and present them in a freely-available and easy-to-navigate database. The Exploit Database is a repository for exploits and Proof-of-Concepts rather than advisories, making it a valuable resource for those who need actionable data right away.
 
 This repository is updated daily with the most recently added submissions. Any additional resources can be found in our [binary sploits repository](https://github.com/offensive-security/exploit-database-bin-sploits).
 
-Included with this repository is the **searchsploit** utility, which will allow you to search through the exploits using one or more terms.
+Exploits are located in the `/exploit/` directory, shellcodes can be found in the `/shellcode/` directory and `/files_papers.csv` is an [index file](https://github.com/offensive-security/exploit-database/blob/master/files.csv) for the whole archive.
+
+Included with this repository is the **SearchSploit** utility, which will allow you to search through exploits and shellcodes using one or more terms.
 For more information, please see the [SearchSploit manual](https://www.exploit-db.com/searchsploit/).
 
 ```
@@ -60,22 +65,22 @@ root@kali:~#
 root@kali:~# searchsploit afd windows local
 ---------------------------------------------------------------------------------------- -----------------------------------
  Exploit Title                                                                          |  Path
-                                                                                        | (/usr/share/exploitdb/platforms/)
+                                                                                        | (/usr/share/exploitdb/)
 ---------------------------------------------------------------------------------------- -----------------------------------
-Microsoft Windows (x86) - 'afd.sys' Privilege Escalation (MS11-046)                     | win_x86/local/40564.c
-Microsoft Windows - 'AfdJoinLeaf' Privilege Escalation (MS11-080) (Metasploit)          | windows/local/21844.rb
-Microsoft Windows - 'afd.sys' Local Kernel Exploit (PoC) (MS11-046)                     | windows/dos/18755.c
-Microsoft Windows 7 (x64) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | win_x86-64/local/39525.py
-Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | win_x86/local/39446.py
-Microsoft Windows XP - 'afd.sys' Local Kernel Denial of Service                         | windows/dos/17133.c
-Microsoft Windows XP/2003 - 'afd.sys' Privilege Escalation (K-plugin) (MS08-066)        | windows/local/6757.txt
-Microsoft Windows XP/2003 - 'afd.sys' Privilege Escalation (MS11-080)                   | windows/local/18176.py
+Microsoft Windows (x86) - 'afd.sys' Local Privilege Escalation (MS11-046)               | exploits/win_x86/local/40564.c
+Microsoft Windows - 'AfdJoinLeaf' Local Privilege Escalation (MS11-080) (Metasploit)    | exploits/windows/local/21844.rb
+Microsoft Windows - 'afd.sys' Local Kernel (PoC) (MS11-046)                             | exploits/windows/dos/18755.c
+Microsoft Windows 7 (x64) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/win_x86-64/local/39525.py
+Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/win_x86/local/39446.py
+Microsoft Windows XP - 'afd.sys' Local Kernel Denial of Service                         | exploits/windows/dos/17133.c
+Microsoft Windows XP/2003 - 'afd.sys' Local Privilege Escalation (K-plugin) (MS08-066)  | exploits/windows/local/6757.txt
+Microsoft Windows XP/2003 - 'afd.sys' Local Privilege Escalation (MS11-080)             | exploits/windows/local/18176.py
 ---------------------------------------------------------------------------------------- -----------------------------------
 root@kali:~#
 root@kali:~# searchsploit -p 39446
 Exploit: Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)
     URL: https://www.exploit-db.com/exploits/39446/
-   Path: /usr/share/exploitdb/platforms/win_x86/local/39446.py
+   Path: /usr/share/exploitdb/exploits/win_x86/local/39446.py
 
 Copied EDB-ID 39446's path to the clipboard.
 
diff --git a/searchsploit b/searchsploit
index 046bae613..edef30220 100644
--- a/searchsploit
+++ b/searchsploit
@@ -1,6 +1,6 @@
 #!/bin/bash
 #       Name: SearchSploit - Exploit-DB's CLI search tool
-#    Version: 3.8.6 (Release date: 2017-20-23)
+#    Version: 3.8.7 (Release date: 2017-11-27)
 # Written by: Offensive Security, Unix-Ninja, and g0tmi1k
 #   Homepage: https://github.com/offensive-security/exploit-database
 #     Manual: https://www.exploit-db.com/searchsploit/
@@ -206,7 +206,7 @@ function updategit()
   fi
 
   echo -e "\n[*] Git update finished."
-  echo "[i] Path: ${gitpath}/platforms/"
+  echo "[i] Path: ${gitpath}/"
   exit 6
 }
 
@@ -626,7 +626,7 @@ if [[ "${JSON}" -eq 0 ]]; then
   else
     echo "|  Path"
     printf "%-${COL1}s "
-    echo "| (${gitpath}/platforms/)"
+    echo "| (${gitpath}/)"
   fi
   drawline
 ## Print JSON header
@@ -722,7 +722,6 @@ elif [[ "${EDBID}" -eq 1 ]]; then
 else
   OUTPUT="$( eval ${SEARCH} \
     | awk -F ',' '{ printf "%-'${FORMAT}'s | %s\n", $2, $3 }' \
-    | sed 's_| platforms/_| _' \
     | sort )"
 fi