diff --git a/cmd/cayley/main.go b/cayley.go
similarity index 90%
rename from cmd/cayley/main.go
rename to cayley.go
index 153cf76..06af4f2 100644
--- a/cmd/cayley/main.go
+++ b/cayley.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/barakmich/glog"
 
-	"github.com/google/cayley"
 	"github.com/google/cayley/config"
+	"github.com/google/cayley/db"
 	"github.com/google/cayley/graph"
 	"github.com/google/cayley/http"
 )
@@ -69,17 +69,17 @@ func main() {
 	}
 	switch cmd {
 	case "init":
-		cayley.CayleyInit(cfg, *tripleFile)
+		db.CayleyInit(cfg, *tripleFile)
 	case "load":
-		ts = cayley.OpenTSFromConfig(cfg)
-		cayley.CayleyLoad(ts, cfg, *tripleFile, false)
+		ts = db.OpenTSFromConfig(cfg)
+		db.CayleyLoad(ts, cfg, *tripleFile, false)
 		ts.Close()
 	case "repl":
-		ts = cayley.OpenTSFromConfig(cfg)
-		cayley.CayleyRepl(ts, *queryLanguage, cfg)
+		ts = db.OpenTSFromConfig(cfg)
+		db.CayleyRepl(ts, *queryLanguage, cfg)
 		ts.Close()
 	case "http":
-		ts = cayley.OpenTSFromConfig(cfg)
+		ts = db.OpenTSFromConfig(cfg)
 		http.CayleyHTTP(ts, cfg)
 		ts.Close()
 	default:
diff --git a/init.go b/db/init.go
similarity index 98%
rename from init.go
rename to db/init.go
index 5e60b3a..d3ab8a8 100644
--- a/init.go
+++ b/db/init.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cayley
+package db
 
 import (
 	"github.com/google/cayley/config"
diff --git a/load.go b/db/load.go
similarity index 99%
rename from load.go
rename to db/load.go
index 8dc9d59..ff232a0 100644
--- a/load.go
+++ b/db/load.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cayley
+package db
 
 import (
 	"os"
diff --git a/open.go b/db/open.go
similarity index 98%
rename from open.go
rename to db/open.go
index 0c82acd..7095739 100644
--- a/open.go
+++ b/db/open.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cayley
+package db
 
 import (
 	"github.com/barakmich/glog"
diff --git a/repl.go b/db/repl.go
similarity index 99%
rename from repl.go
rename to db/repl.go
index 62f3e5e..405d61e 100644
--- a/repl.go
+++ b/db/repl.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cayley
+package db
 
 import (
 	"bufio"