diff --git a/MailHog-Server/http/api/v1.go b/MailHog-Server/api/v1.go
similarity index 100%
rename from MailHog-Server/http/api/v1.go
rename to MailHog-Server/api/v1.go
diff --git a/MailHog-Server/main.go b/MailHog-Server/main.go
index 76a1956..d4f952d 100644
--- a/MailHog-Server/main.go
+++ b/MailHog-Server/main.go
@@ -4,11 +4,11 @@ import (
 	"flag"
 	"os"
 
+	"github.com/ian-kent/Go-MailHog/MailHog-Server/api"
 	"github.com/ian-kent/Go-MailHog/MailHog-Server/config"
-	"github.com/ian-kent/Go-MailHog/MailHog-Server/http/api"
-	"github.com/ian-kent/Go-MailHog/MailHog-Server/smtp"
 	"github.com/ian-kent/Go-MailHog/MailHog-UI/assets"
 	"github.com/ian-kent/Go-MailHog/http"
+	"github.com/ian-kent/Go-MailHog/smtp"
 	"github.com/ian-kent/go-log/log"
 	gotcha "github.com/ian-kent/gotcha/app"
 )
diff --git a/MailHog-UI/http/web/web.go b/MailHog-UI/web/web.go
similarity index 100%
rename from MailHog-UI/http/web/web.go
rename to MailHog-UI/web/web.go
diff --git a/MailHog/main.go b/MailHog/main.go
index 91a7eb6..170a6d1 100644
--- a/MailHog/main.go
+++ b/MailHog/main.go
@@ -4,12 +4,12 @@ import (
 	"flag"
 	"os"
 
+	"github.com/ian-kent/Go-MailHog/MailHog-Server/api"
 	"github.com/ian-kent/Go-MailHog/MailHog-Server/config"
-	"github.com/ian-kent/Go-MailHog/MailHog-Server/http/api"
-	"github.com/ian-kent/Go-MailHog/MailHog-Server/smtp"
 	"github.com/ian-kent/Go-MailHog/MailHog-UI/assets"
-	"github.com/ian-kent/Go-MailHog/MailHog-UI/http/web"
+	"github.com/ian-kent/Go-MailHog/MailHog-UI/web"
 	"github.com/ian-kent/Go-MailHog/http"
+	"github.com/ian-kent/Go-MailHog/smtp"
 	"github.com/ian-kent/go-log/log"
 	gotcha "github.com/ian-kent/gotcha/app"
 )
diff --git a/Makefile b/Makefile
index 236f7ed..3209c37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,16 @@
 DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 
-all: deps bindata fmt
+all: deps bindata fmt combined
+
+combined:
 	go install ./MailHog
 
+server:
+	go install ./MailHog-Server
+
+ui:
+	go install ./MailHog-UI
+
 bindata:
 	go-bindata -o MailHog-UI/assets/assets.go -pkg assets -prefix MailHog-UI/ MailHog-UI/assets/...
 
@@ -25,4 +33,4 @@ test-deps:
 release-deps:
 	go get github.com/mitchellh/gox
 
-.PNONY: all bindata release fmt test-deps release-deps
+.PNONY: all combined server ui bindata release fmt test-deps release-deps
diff --git a/MailHog-Server/smtp/smtp.go b/smtp/server.go
similarity index 100%
rename from MailHog-Server/smtp/smtp.go
rename to smtp/server.go