diff --git a/Makefile b/Makefile
index 8386fd5..b5108fb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 all: deps fmt combined
 
 combined:
-	go install ./MailHog
+	go install .
 
 release: release-deps
-	gox -output="build/{{.Dir}}_{{.OS}}_{{.Arch}}" ./MailHog
+	gox -output="build/{{.Dir}}_{{.OS}}_{{.Arch}}" .
 
 fmt:
 	go fmt ./...
diff --git a/README.md b/README.md
index 5ecaf80..5801100 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,9 @@ Go was chosen for portability - MailHog runs without installation on multiple pl
 ### Getting started
 
 1. Either:
-  * [Download the latest release](RELEASES.md) of MailHog for your platform
-  * [Read the deployment guide](DEPLOY.md) for other deployment options
-2. [Configure MailHog](CONFIG.md), or use the default settings:
+  * [Download the latest release](/docs/RELEASES.md) of MailHog for your platform
+  * [Read the deployment guide](/docs/DEPLOY.md) for other deployment options
+2. [Configure MailHog](/docs/CONFIG.md), or use the default settings:
   * the SMTP server will start on port 1025
   * the HTTP server will start on port 8025
   * in-memory message storage will be used.
@@ -30,9 +30,9 @@ Go was chosen for portability - MailHog runs without installation on multiple pl
 * Real-time updates using EventSource
 * Release messages to real SMTP servers
 * Chaos Monkey for failure testing
-  * See [Introduction to Jim](JIM.md) for more information
+  * See [Introduction to Jim](/docs/JIM.md) for more information
 * HTTP API to list, retrieve and delete messages
-  * See [APIv1 documentation](APIv1.md) for more information
+  * See [APIv1 documentation](/docs/APIv1.md) for more information
 * Multipart MIME support
 * Download individual MIME parts
 * In-memory message storage
@@ -40,7 +40,7 @@ Go was chosen for portability - MailHog runs without installation on multiple pl
 * Lightweight and portable
 * No installation required
 
-![Screenshot of MailHog web interface](/images/MailHog.png "MailHog web interface")
+![Screenshot of MailHog web interface](/docs/MailHog.png "MailHog web interface")
 
 ### Contributing
 
diff --git a/APIv1.md b/docs/APIv1.md
similarity index 100%
rename from APIv1.md
rename to docs/APIv1.md
diff --git a/BUILD.md b/docs/BUILD.md
similarity index 100%
rename from BUILD.md
rename to docs/BUILD.md
diff --git a/CONFIG.md b/docs/CONFIG.md
similarity index 100%
rename from CONFIG.md
rename to docs/CONFIG.md
diff --git a/DEPLOY.md b/docs/DEPLOY.md
similarity index 100%
rename from DEPLOY.md
rename to docs/DEPLOY.md
diff --git a/JIM.md b/docs/JIM.md
similarity index 100%
rename from JIM.md
rename to docs/JIM.md
diff --git a/images/MailHog.png b/docs/MailHog.png
similarity index 100%
rename from images/MailHog.png
rename to docs/MailHog.png
diff --git a/RELEASES.md b/docs/RELEASES.md
similarity index 100%
rename from RELEASES.md
rename to docs/RELEASES.md
diff --git a/MailHog/main.go b/main.go
similarity index 100%
rename from MailHog/main.go
rename to main.go