diff --git a/Makefile b/Makefile
index 4eccad75a..a12682c5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 all:
 	@mkdir -p bin/
-	go build -o bin/packer packer/bin-packer
+	go build -o bin/packer
 
 .PHONY: all
diff --git a/src/packer/bin-packer/main.go b/packer.go
similarity index 57%
rename from src/packer/bin-packer/main.go
rename to packer.go
index 03a78cb50..643a564d8 100644
--- a/src/packer/bin-packer/main.go
+++ b/packer.go
@@ -2,11 +2,7 @@
 package main
 
 import (
-	"fmt"
-	"os"
 )
 
 func main() {
-	fmt.Printf("%#v\n", os.Args)
-	fmt.Println("Hello, world.")
 }
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index ce3941ec6..000000000
--- a/setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Get the full path to the directory where this script is, because
-# GOPATH prefers full paths.
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-# Setup our GOPATH
-echo "Setting GOPATH to: ${DIR}"
-export GOPATH="${DIR}"