diff --git a/Makefile b/Makefile
index 2001365a4..b53ff5732 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ all: test install
 test:
 	mkdir -p cover
 	godep go test -race -coverprofile=cover/cover.out github.com/minio-io/minio
-	godep go test -race github.com/minio-io/minio/minio
+	godep go test -race github.com/minio-io/minio/cmd/minio
 
 install:
-	godep go install -race github.com/minio-io/minio/minio
+	godep go install -race github.com/minio-io/minio/cmd/minio
 
 save:
 	godep save ./...
diff --git a/cmd/minio-sandbox/main.go b/cmd/minio-sandbox/main.go
new file mode 100644
index 000000000..0713edc19
--- /dev/null
+++ b/cmd/minio-sandbox/main.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"github.com/codegangsta/cli"
+	"log"
+	"os"
+)
+
+func main() {
+	app := cli.NewApp()
+	app.Commands = []cli.Command{
+		{
+			Name:  "put",
+			Usage: "Start a storage node",
+			Action: func(c *cli.Context) {
+			},
+		},
+		{
+			Name:  "get",
+			Usage: "Start a gateway node",
+			Action: func(c *cli.Context) {
+			},
+		},
+	}
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal("App failed to load", err)
+	}
+}
diff --git a/minio/main.go b/cmd/minio/main.go
similarity index 100%
rename from minio/main.go
rename to cmd/minio/main.go