diff --git a/proxy/cache.go b/cache.go
similarity index 98%
rename from proxy/cache.go
rename to cache.go
index 3de513d..a5f3ecf 100644
--- a/proxy/cache.go
+++ b/cache.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package imageproxy
 
 // The Cache interface defines a cache for storing arbitrary data.  The
 // interface is designed to align with httpcache.Cache.
diff --git a/imageproxy.go b/cmd/imageproxy/main.go
similarity index 96%
rename from imageproxy.go
rename to cmd/imageproxy/main.go
index 8f2a7d1..66c1315 100644
--- a/imageproxy.go
+++ b/cmd/imageproxy/main.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/gregjones/httpcache"
 	"github.com/gregjones/httpcache/diskcache"
-	"willnorris.com/go/imageproxy/proxy"
+	"willnorris.com/go/imageproxy"
 )
 
 // goxc values
@@ -56,7 +56,7 @@ func main() {
 		c = httpcache.NewMemoryCache()
 	}
 
-	p := proxy.NewProxy(nil, c)
+	p := imageproxy.NewProxy(nil, c)
 	p.MaxWidth = 2000
 	p.MaxHeight = 2000
 	if *whitelist != "" {
diff --git a/proxy/data.go b/data.go
similarity index 99%
rename from proxy/data.go
rename to data.go
index 0c814ba..100a773 100644
--- a/proxy/data.go
+++ b/data.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package data provides common shared data structures for imageproxy.
-package proxy
+package imageproxy
 
 import (
 	"bytes"
diff --git a/proxy/data_test.go b/data_test.go
similarity index 99%
rename from proxy/data_test.go
rename to data_test.go
index 0df68db..0e29f18 100644
--- a/proxy/data_test.go
+++ b/data_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package imageproxy
 
 import (
 	"net/http"
diff --git a/proxy/proxy.go b/proxy.go
similarity index 99%
rename from proxy/proxy.go
rename to proxy.go
index 7f8ca40..9f4a5ae 100644
--- a/proxy/proxy.go
+++ b/proxy.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package proxy provides the image proxy.
-package proxy
+package imageproxy
 
 import (
 	"bufio"
diff --git a/proxy/transform.go b/transform.go
similarity index 96%
rename from proxy/transform.go
rename to transform.go
index b192931..aa077ef 100644
--- a/proxy/transform.go
+++ b/transform.go
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package transform handles image transformation such as resizing.
-package proxy
+package imageproxy
 
 import (
 	"bytes"