diff --git a/AUTHORS b/AUTHORS
index 8ddb5b7..ca7061c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,3 +10,4 @@
 
 Google Inc.
 Jan Mercl <0xjnml@gmail.com>
+Sebastien Binet <seb.binet@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 50b69c8..d3b9430 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -32,3 +32,4 @@
 Nigel Tao <nigeltao@golang.org>
 Rob Pike <r@golang.org>
 Russ Cox <rsc@golang.org>
+Sebastien Binet <seb.binet@gmail.com>
diff --git a/README b/README
index 64a64e4..5074bba 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 The Snappy compression format in the Go programming language.
 
 To download and install from source:
-$ go get github.com/golang/snappy/snappy
+$ go get github.com/golang/snappy
 
 Unless otherwise noted, the Snappy-Go source files are distributed
 under the BSD-style license found in the LICENSE file.
diff --git a/snappy/decode.go b/decode.go
similarity index 100%
rename from snappy/decode.go
rename to decode.go
diff --git a/snappy/encode.go b/encode.go
similarity index 100%
rename from snappy/encode.go
rename to encode.go
diff --git a/snappy/snappy.go b/snappy.go
similarity index 97%
rename from snappy/snappy.go
rename to snappy.go
index 043bf3d..b22f457 100644
--- a/snappy/snappy.go
+++ b/snappy.go
@@ -6,7 +6,7 @@
 // It aims for very high speeds and reasonable compression.
 //
 // The C++ snappy implementation is at http://code.google.com/p/snappy/
-package snappy
+package snappy // import "github.com/golang/snappy"
 
 import (
 	"hash/crc32"
diff --git a/snappy/snappy_test.go b/snappy_test.go
similarity index 100%
rename from snappy/snappy_test.go
rename to snappy_test.go