diff --git a/README.md b/README.md
index 72a72bc..671c932 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 go-github is Go library for accessing the [GitHub API][].
 
-**Documentation:** <http://godoc.org/github.com/google/go-github>  
+**Documentation:** <http://godoc.org/github.com/google/go-github/github>  
 **Build Status:** [![Build Status](https://travis-ci.org/google/go-github.png?branch=master)](https://travis-ci.org/google/go-github)
 
 
diff --git a/examples/example.go b/examples/example.go
index 14dbbe6..fad2a8c 100644
--- a/examples/example.go
+++ b/examples/example.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-github"
+	"github.com/google/go-github/github"
 )
 
 func main() {
diff --git a/github.go b/github/github.go
similarity index 100%
rename from github.go
rename to github/github.go
diff --git a/github_test.go b/github/github_test.go
similarity index 100%
rename from github_test.go
rename to github/github_test.go
diff --git a/orgs.go b/github/orgs.go
similarity index 100%
rename from orgs.go
rename to github/orgs.go
diff --git a/orgs_test.go b/github/orgs_test.go
similarity index 100%
rename from orgs_test.go
rename to github/orgs_test.go
diff --git a/repos.go b/github/repos.go
similarity index 100%
rename from repos.go
rename to github/repos.go
diff --git a/repos_test.go b/github/repos_test.go
similarity index 100%
rename from repos_test.go
rename to github/repos_test.go
diff --git a/users.go b/github/users.go
similarity index 100%
rename from users.go
rename to github/users.go
diff --git a/users_test.go b/github/users_test.go
similarity index 100%
rename from users_test.go
rename to github/users_test.go