diff --git a/MailHog/main.go b/MailHog/main.go
index aaf275a..dea975e 100644
--- a/MailHog/main.go
+++ b/MailHog/main.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 
+	"github.com/ian-kent/Go-MailHog/MailHog-UI/assets"
 	"github.com/ian-kent/Go-MailHog/config"
 	"github.com/ian-kent/Go-MailHog/data"
 	mhhttp "github.com/ian-kent/Go-MailHog/http"
@@ -42,7 +43,7 @@ func configure() {
 		MongoUri:     mongouri,
 		MongoDb:      mongodb,
 		MongoColl:    mongocoll,
-		Assets:       Asset,
+		Assets:       assets.Asset,
 		MessageChan:  make(chan *data.Message),
 	}
 
@@ -83,7 +84,7 @@ func main() {
 func web_listen() {
 	log.Info("[HTTP] Binding to address: %s", conf.HTTPBindAddr)
 
-	var app = gotcha.Create(Asset)
+	var app = gotcha.Create(assets.Asset)
 	app.Config.Listen = conf.HTTPBindAddr
 
 	app.On(events.BeforeHandler, func(session *http.Session, next func()) {
diff --git a/Makefile b/Makefile
index fa60c2a..0dae9ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,10 @@
 DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 
 all: deps bindata fmt
-	go install
+	go install ./MailHog
 
 bindata:
-	go-bindata assets/...
-
-test: test-deps
-	go list ./... | xargs -n1 go test
+	go-bindata -o MailHog-UI/assets/assets.go -pkg assets MailHog-UI/assets/...
 
 release: release-deps
 	gox -output="build/{{.Dir}}_{{.OS}}_{{.Arch}}"
@@ -23,9 +20,9 @@ deps:
 	go get labix.org/v2/mgo
 
 test-deps:
-	go get github.com/stretchr/testify
+	go get github.com/smartystreets/goconvey
 
 release-deps:
 	go get github.com/mitchellh/gox
 
-.PNONY: all test deps bindata release fmt test-deps release-deps
+.PNONY: all bindata release fmt test-deps release-deps