diff --git a/graph/archive.go b/archive.go
similarity index 99%
rename from graph/archive.go
rename to archive.go
index b6281bf4b5..78d4dfca0b 100644
--- a/graph/archive.go
+++ b/archive.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"errors"
diff --git a/graph/archive_test.go b/archive_test.go
similarity index 98%
rename from graph/archive_test.go
rename to archive_test.go
index c158537a6e..9f00aeccd7 100644
--- a/graph/archive_test.go
+++ b/archive_test.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"io/ioutil"
diff --git a/graph/changes.go b/changes.go
similarity index 99%
rename from graph/changes.go
rename to changes.go
index eebf7657e7..4c79918887 100644
--- a/graph/changes.go
+++ b/changes.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"fmt"
diff --git a/commands.go b/commands.go
index e0d4fd0390..78d24ad0a0 100644
--- a/commands.go
+++ b/commands.go
@@ -803,7 +803,7 @@ func NewServer() (*Server, error) {
 	// if err != nil {
 	// 	return nil, err
 	// }
-	runtime, err := New()
+	runtime, err := NewRuntime()
 	if err != nil {
 		return nil, err
 	}
diff --git a/container.go b/container.go
index 2dcc3d0e28..ea091b8fa5 100644
--- a/container.go
+++ b/container.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/dotcloud/docker/graph"
 	"github.com/kr/pty"
 	"io"
 	"io/ioutil"
@@ -63,11 +62,6 @@ type NetworkSettings struct {
 	PortMapping map[string]string
 }
 
-func GenerateId() string {
-	return graph.GenerateId() // Re-use the same code to generate container and image IDs
-	// (this might change when image Ids become content-based)
-}
-
 func (container *Container) Cmd() *exec.Cmd {
 	return container.cmd
 }
@@ -376,15 +370,15 @@ func (container *Container) Wait() int {
 	return container.State.ExitCode
 }
 
-func (container *Container) ExportRw() (graph.Archive, error) {
-	return graph.Tar(container.rwPath(), graph.Uncompressed)
+func (container *Container) ExportRw() (Archive, error) {
+	return Tar(container.rwPath(), Uncompressed)
 }
 
-func (container *Container) Export() (graph.Archive, error) {
+func (container *Container) Export() (Archive, error) {
 	if err := container.EnsureMounted(); err != nil {
 		return nil, err
 	}
-	return graph.Tar(container.RootfsPath(), graph.Uncompressed)
+	return Tar(container.RootfsPath(), Uncompressed)
 }
 
 func (container *Container) WaitTimeout(timeout time.Duration) error {
@@ -420,7 +414,7 @@ func (container *Container) Mount() error {
 	return image.Mount(container.RootfsPath(), container.rwPath())
 }
 
-func (container *Container) Changes() ([]graph.Change, error) {
+func (container *Container) Changes() ([]Change, error) {
 	image, err := container.GetImage()
 	if err != nil {
 		return nil, err
@@ -428,7 +422,7 @@ func (container *Container) Changes() ([]graph.Change, error) {
 	return image.Changes(container.rwPath())
 }
 
-func (container *Container) GetImage() (*graph.Image, error) {
+func (container *Container) GetImage() (*Image, error) {
 	if container.runtime == nil {
 		return nil, fmt.Errorf("Can't get image of unregistered container")
 	}
@@ -436,11 +430,11 @@ func (container *Container) GetImage() (*graph.Image, error) {
 }
 
 func (container *Container) Mounted() (bool, error) {
-	return graph.Mounted(container.RootfsPath())
+	return Mounted(container.RootfsPath())
 }
 
 func (container *Container) Unmount() error {
-	return graph.Unmount(container.RootfsPath())
+	return Unmount(container.RootfsPath())
 }
 
 func (container *Container) logPath(name string) string {
diff --git a/graph/graph.go b/graph.go
similarity index 95%
rename from graph/graph.go
rename to graph.go
index 6470e17aea..5001852c32 100644
--- a/graph/graph.go
+++ b/graph.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"fmt"
@@ -13,7 +13,7 @@ type Graph struct {
 	Root string
 }
 
-func New(root string) (*Graph, error) {
+func NewGraph(root string) (*Graph, error) {
 	abspath, err := filepath.Abs(root)
 	if err != nil {
 		return nil, err
@@ -84,7 +84,7 @@ func (graph *Graph) Register(layerData Archive, img *Image) error {
 }
 
 func (graph *Graph) Mktemp(id string) (string, error) {
-	tmp, err := New(path.Join(graph.Root, ":tmp:"))
+	tmp, err := NewGraph(path.Join(graph.Root, ":tmp:"))
 	if err != nil {
 		return "", fmt.Errorf("Couldn't create temp: %s", err)
 	}
@@ -95,7 +95,7 @@ func (graph *Graph) Mktemp(id string) (string, error) {
 }
 
 func (graph *Graph) Garbage() (*Graph, error) {
-	return New(path.Join(graph.Root, ":garbage:"))
+	return NewGraph(path.Join(graph.Root, ":garbage:"))
 }
 
 func (graph *Graph) Delete(id string) error {
diff --git a/graph/graph_test.go b/graph_test.go
similarity index 98%
rename from graph/graph_test.go
rename to graph_test.go
index d634ea85d5..20e879e52c 100644
--- a/graph/graph_test.go
+++ b/graph_test.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"archive/tar"
@@ -28,7 +28,7 @@ func TestInit(t *testing.T) {
 
 // FIXME: Do more extensive tests (ex: create multiple, delete, recreate;
 //       create multiple, check the amount of images and paths, etc..)
-func TestCreate(t *testing.T) {
+func TestGraphCreate(t *testing.T) {
 	graph := tempGraph(t)
 	defer os.RemoveAll(graph.Root)
 	archive, err := fakeTar()
@@ -177,7 +177,7 @@ func tempGraph(t *testing.T) *Graph {
 	if err != nil {
 		t.Fatal(err)
 	}
-	graph, err := New(tmp)
+	graph, err := NewGraph(tmp)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/graph/image.go b/image.go
similarity index 99%
rename from graph/image.go
rename to image.go
index 210ba7cedb..e508a164ea 100644
--- a/graph/image.go
+++ b/image.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"bytes"
diff --git a/graph/mount.go b/mount.go
similarity index 98%
rename from graph/mount.go
rename to mount.go
index ebf8485285..bb1a40eddb 100644
--- a/graph/mount.go
+++ b/mount.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"fmt"
diff --git a/graph/mount_darwin.go b/mount_darwin.go
similarity index 92%
rename from graph/mount_darwin.go
rename to mount_darwin.go
index 1fb24390b3..aeac78cda5 100644
--- a/graph/mount_darwin.go
+++ b/mount_darwin.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import "errors"
 
diff --git a/graph/mount_linux.go b/mount_linux.go
similarity index 92%
rename from graph/mount_linux.go
rename to mount_linux.go
index fd849821cf..0efb253003 100644
--- a/graph/mount_linux.go
+++ b/mount_linux.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import "syscall"
 
diff --git a/runtime.go b/runtime.go
index ad543f0ed8..2c15c35937 100644
--- a/runtime.go
+++ b/runtime.go
@@ -3,7 +3,6 @@ package docker
 import (
 	"container/list"
 	"fmt"
-	"github.com/dotcloud/docker/graph"
 	"io"
 	"io/ioutil"
 	"log"
@@ -19,8 +18,8 @@ type Runtime struct {
 	repository     string
 	containers     *list.List
 	networkManager *NetworkManager
-	graph          *graph.Graph
-	repositories   *graph.TagStore
+	graph          *Graph
+	repositories   *TagStore
 }
 
 var sysInitPath string
@@ -191,22 +190,22 @@ func (runtime *Runtime) restore() error {
 	return nil
 }
 
-func New() (*Runtime, error) {
-	return NewFromDirectory("/var/lib/docker")
+func NewRuntime() (*Runtime, error) {
+	return NewRuntimeFromDirectory("/var/lib/docker")
 }
 
-func NewFromDirectory(root string) (*Runtime, error) {
+func NewRuntimeFromDirectory(root string) (*Runtime, error) {
 	runtime_repo := path.Join(root, "containers")
 
 	if err := os.MkdirAll(runtime_repo, 0700); err != nil && !os.IsExist(err) {
 		return nil, err
 	}
 
-	g, err := graph.New(path.Join(root, "graph"))
+	g, err := NewGraph(path.Join(root, "graph"))
 	if err != nil {
 		return nil, err
 	}
-	repositories, err := graph.NewTagStore(path.Join(root, "repositories"), g)
+	repositories, err := NewTagStore(path.Join(root, "repositories"), g)
 	if err != nil {
 		return nil, fmt.Errorf("Couldn't create Tag store: %s", err)
 	}
diff --git a/runtime_test.go b/runtime_test.go
index f97d049813..fe3ab4810f 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -1,7 +1,6 @@
 package docker
 
 import (
-	"github.com/dotcloud/docker/graph"
 	"io"
 	"io/ioutil"
 	"os"
@@ -57,7 +56,7 @@ func init() {
 	unitTestStoreBase = root
 
 	// Make it our Store root
-	runtime, err := NewFromDirectory(root)
+	runtime, err := NewRuntimeFromDirectory(root)
 	if err != nil {
 		panic(err)
 	}
@@ -84,7 +83,7 @@ func newTestRuntime() (*Runtime, error) {
 		return nil, err
 	}
 
-	runtime, err := NewFromDirectory(root)
+	runtime, err := NewRuntimeFromDirectory(root)
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +91,7 @@ func newTestRuntime() (*Runtime, error) {
 	return runtime, nil
 }
 
-func GetTestImage(runtime *Runtime) *graph.Image {
+func GetTestImage(runtime *Runtime) *Image {
 	imgs, err := runtime.graph.All()
 	if err != nil {
 		panic(err)
@@ -102,7 +101,7 @@ func GetTestImage(runtime *Runtime) *graph.Image {
 	return imgs[0]
 }
 
-func TestCreate(t *testing.T) {
+func TestRuntimeCreate(t *testing.T) {
 	runtime, err := newTestRuntime()
 	if err != nil {
 		t.Fatal(err)
@@ -269,7 +268,7 @@ func TestRestore(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	runtime1, err := NewFromDirectory(root)
+	runtime1, err := NewRuntimeFromDirectory(root)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -294,7 +293,7 @@ func TestRestore(t *testing.T) {
 
 	// Here are are simulating a docker restart - that is, reloading all containers
 	// from scratch
-	runtime2, err := NewFromDirectory(root)
+	runtime2, err := NewRuntimeFromDirectory(root)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/graph/tags.go b/tags.go
similarity index 99%
rename from graph/tags.go
rename to tags.go
index f3d702fcf7..908691a8f9 100644
--- a/graph/tags.go
+++ b/tags.go
@@ -1,4 +1,4 @@
-package graph
+package docker
 
 import (
 	"encoding/json"