diff --git a/Makefile b/Makefile
index d72abe41b..9a97c21df 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,8 @@ test-all: build-all
 	@echo "Running Test Suites:"
 	@godep go test -race ./...
 
+test: test-all
+
 minio: build-all test-all
 
 install: minio
diff --git a/pkg/httpserver/httpserver.go b/pkg/server/httpserver/httpserver.go
similarity index 100%
rename from pkg/httpserver/httpserver.go
rename to pkg/server/httpserver/httpserver.go
diff --git a/pkg/httpserver/tlshelpers.go b/pkg/server/httpserver/tlshelpers.go
similarity index 100%
rename from pkg/httpserver/tlshelpers.go
rename to pkg/server/httpserver/tlshelpers.go
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 57e6a5d46..4c8c39d28 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/minio-io/minio/pkg/api/minioapi"
 	"github.com/minio-io/minio/pkg/api/webuiapi"
-	"github.com/minio-io/minio/pkg/httpserver"
+	"github.com/minio-io/minio/pkg/server/httpserver"
 	mstorage "github.com/minio-io/minio/pkg/storage"
 	"github.com/minio-io/minio/pkg/storage/fs"
 	"github.com/minio-io/minio/pkg/storage/inmemory"