diff --git a/contrib/docker-device-tool/device_tool.go b/contrib/docker-device-tool/device_tool.go
index 4d1ee0cea5..12c762a7f3 100644
--- a/contrib/docker-device-tool/device_tool.go
+++ b/contrib/docker-device-tool/device_tool.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/dotcloud/docker/graphdriver/devmapper"
+	"github.com/dotcloud/docker/runtime/graphdriver/devmapper"
 	"os"
 	"path"
 	"sort"
diff --git a/graph/graph.go b/graph/graph.go
index 01659b549f..f71b8a003e 100644
--- a/graph/graph.go
+++ b/graph/graph.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/dockerversion"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/runconfig"
 	"github.com/dotcloud/docker/utils"
diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
index 153f94db3d..cae5c2916e 100644
--- a/graph/tags_unit_test.go
+++ b/graph/tags_unit_test.go
@@ -2,8 +2,8 @@ package graph
 
 import (
 	"bytes"
-	"github.com/dotcloud/docker/graphdriver"
-	_ "github.com/dotcloud/docker/graphdriver/vfs" // import the vfs driver so it is used in the tests
+	"github.com/dotcloud/docker/runtime/graphdriver"
+	_ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/utils"
 	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
diff --git a/image/graph.go b/image/graph.go
index 857c09edd9..dd0136b00e 100644
--- a/image/graph.go
+++ b/image/graph.go
@@ -1,7 +1,7 @@
 package image
 
 import (
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 )
 
 type Graph interface {
diff --git a/image/image.go b/image/image.go
index e091879049..b2ddb03b0b 100644
--- a/image/image.go
+++ b/image/image.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"github.com/dotcloud/docker/runconfig"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"
diff --git a/integration/graph_test.go b/integration/graph_test.go
index e575a252f3..ea9ddc7ae9 100644
--- a/integration/graph_test.go
+++ b/integration/graph_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/graph"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/utils"
 	"io"
diff --git a/runtime/container.go b/runtime/container.go
index f4de40a16a..3c7aa22751 100644
--- a/runtime/container.go
+++ b/runtime/container.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/runtime/execdriver"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/links"
 	"github.com/dotcloud/docker/nat"
diff --git a/graphdriver/aufs/aufs.go b/runtime/graphdriver/aufs/aufs.go
similarity index 99%
rename from graphdriver/aufs/aufs.go
rename to runtime/graphdriver/aufs/aufs.go
index a15cf6b273..83a6579bc6 100644
--- a/graphdriver/aufs/aufs.go
+++ b/runtime/graphdriver/aufs/aufs.go
@@ -24,7 +24,7 @@ import (
 	"bufio"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	mountpk "github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/utils"
 	"os"
diff --git a/graphdriver/aufs/aufs_test.go b/runtime/graphdriver/aufs/aufs_test.go
similarity index 99%
rename from graphdriver/aufs/aufs_test.go
rename to runtime/graphdriver/aufs/aufs_test.go
index 6002bec5a1..cb417c3b26 100644
--- a/graphdriver/aufs/aufs_test.go
+++ b/runtime/graphdriver/aufs/aufs_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"io/ioutil"
 	"os"
 	"path"
diff --git a/graphdriver/aufs/dirs.go b/runtime/graphdriver/aufs/dirs.go
similarity index 100%
rename from graphdriver/aufs/dirs.go
rename to runtime/graphdriver/aufs/dirs.go
diff --git a/graphdriver/aufs/migrate.go b/runtime/graphdriver/aufs/migrate.go
similarity index 100%
rename from graphdriver/aufs/migrate.go
rename to runtime/graphdriver/aufs/migrate.go
diff --git a/graphdriver/aufs/mount.go b/runtime/graphdriver/aufs/mount.go
similarity index 100%
rename from graphdriver/aufs/mount.go
rename to runtime/graphdriver/aufs/mount.go
diff --git a/graphdriver/aufs/mount_linux.go b/runtime/graphdriver/aufs/mount_linux.go
similarity index 100%
rename from graphdriver/aufs/mount_linux.go
rename to runtime/graphdriver/aufs/mount_linux.go
diff --git a/graphdriver/aufs/mount_unsupported.go b/runtime/graphdriver/aufs/mount_unsupported.go
similarity index 100%
rename from graphdriver/aufs/mount_unsupported.go
rename to runtime/graphdriver/aufs/mount_unsupported.go
diff --git a/graphdriver/btrfs/btrfs.go b/runtime/graphdriver/btrfs/btrfs.go
similarity index 98%
rename from graphdriver/btrfs/btrfs.go
rename to runtime/graphdriver/btrfs/btrfs.go
index 592e058458..b0530be92b 100644
--- a/graphdriver/btrfs/btrfs.go
+++ b/runtime/graphdriver/btrfs/btrfs.go
@@ -11,7 +11,7 @@ import "C"
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"os"
 	"path"
 	"syscall"
diff --git a/graphdriver/btrfs/dummy_unsupported.go b/runtime/graphdriver/btrfs/dummy_unsupported.go
similarity index 100%
rename from graphdriver/btrfs/dummy_unsupported.go
rename to runtime/graphdriver/btrfs/dummy_unsupported.go
diff --git a/graphdriver/devmapper/attach_loopback.go b/runtime/graphdriver/devmapper/attach_loopback.go
similarity index 100%
rename from graphdriver/devmapper/attach_loopback.go
rename to runtime/graphdriver/devmapper/attach_loopback.go
diff --git a/graphdriver/devmapper/deviceset.go b/runtime/graphdriver/devmapper/deviceset.go
similarity index 100%
rename from graphdriver/devmapper/deviceset.go
rename to runtime/graphdriver/devmapper/deviceset.go
diff --git a/graphdriver/devmapper/devmapper.go b/runtime/graphdriver/devmapper/devmapper.go
similarity index 100%
rename from graphdriver/devmapper/devmapper.go
rename to runtime/graphdriver/devmapper/devmapper.go
diff --git a/graphdriver/devmapper/devmapper_doc.go b/runtime/graphdriver/devmapper/devmapper_doc.go
similarity index 100%
rename from graphdriver/devmapper/devmapper_doc.go
rename to runtime/graphdriver/devmapper/devmapper_doc.go
diff --git a/graphdriver/devmapper/devmapper_log.go b/runtime/graphdriver/devmapper/devmapper_log.go
similarity index 100%
rename from graphdriver/devmapper/devmapper_log.go
rename to runtime/graphdriver/devmapper/devmapper_log.go
diff --git a/graphdriver/devmapper/devmapper_test.go b/runtime/graphdriver/devmapper/devmapper_test.go
similarity index 100%
rename from graphdriver/devmapper/devmapper_test.go
rename to runtime/graphdriver/devmapper/devmapper_test.go
diff --git a/graphdriver/devmapper/devmapper_wrapper.go b/runtime/graphdriver/devmapper/devmapper_wrapper.go
similarity index 100%
rename from graphdriver/devmapper/devmapper_wrapper.go
rename to runtime/graphdriver/devmapper/devmapper_wrapper.go
diff --git a/graphdriver/devmapper/driver.go b/runtime/graphdriver/devmapper/driver.go
similarity index 98%
rename from graphdriver/devmapper/driver.go
rename to runtime/graphdriver/devmapper/driver.go
index 8c5a19eea0..33c7a0f483 100644
--- a/graphdriver/devmapper/driver.go
+++ b/runtime/graphdriver/devmapper/driver.go
@@ -4,7 +4,7 @@ package devmapper
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"
 	"os"
diff --git a/graphdriver/devmapper/driver_test.go b/runtime/graphdriver/devmapper/driver_test.go
similarity index 99%
rename from graphdriver/devmapper/driver_test.go
rename to runtime/graphdriver/devmapper/driver_test.go
index 68699f208e..9af71a00b3 100644
--- a/graphdriver/devmapper/driver_test.go
+++ b/runtime/graphdriver/devmapper/driver_test.go
@@ -4,7 +4,7 @@ package devmapper
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"io/ioutil"
 	"path"
 	"runtime"
diff --git a/graphdriver/devmapper/ioctl.go b/runtime/graphdriver/devmapper/ioctl.go
similarity index 100%
rename from graphdriver/devmapper/ioctl.go
rename to runtime/graphdriver/devmapper/ioctl.go
diff --git a/graphdriver/devmapper/mount.go b/runtime/graphdriver/devmapper/mount.go
similarity index 100%
rename from graphdriver/devmapper/mount.go
rename to runtime/graphdriver/devmapper/mount.go
diff --git a/graphdriver/devmapper/sys.go b/runtime/graphdriver/devmapper/sys.go
similarity index 100%
rename from graphdriver/devmapper/sys.go
rename to runtime/graphdriver/devmapper/sys.go
diff --git a/graphdriver/driver.go b/runtime/graphdriver/driver.go
similarity index 100%
rename from graphdriver/driver.go
rename to runtime/graphdriver/driver.go
diff --git a/graphdriver/vfs/driver.go b/runtime/graphdriver/vfs/driver.go
similarity index 97%
rename from graphdriver/vfs/driver.go
rename to runtime/graphdriver/vfs/driver.go
index 21da63878a..10a7b223a4 100644
--- a/graphdriver/vfs/driver.go
+++ b/runtime/graphdriver/vfs/driver.go
@@ -2,7 +2,7 @@ package vfs
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver"
 	"os"
 	"os/exec"
 	"path"
diff --git a/runtime/runtime.go b/runtime/runtime.go
index f75a4df048..25edd774d8 100644
--- a/runtime/runtime.go
+++ b/runtime/runtime.go
@@ -11,11 +11,11 @@ import (
 	"github.com/dotcloud/docker/runtime/execdriver/execdrivers"
 	"github.com/dotcloud/docker/runtime/execdriver/lxc"
 	"github.com/dotcloud/docker/graph"
-	"github.com/dotcloud/docker/graphdriver"
-	"github.com/dotcloud/docker/graphdriver/aufs"
-	_ "github.com/dotcloud/docker/graphdriver/btrfs"
-	_ "github.com/dotcloud/docker/graphdriver/devmapper"
-	_ "github.com/dotcloud/docker/graphdriver/vfs"
+	"github.com/dotcloud/docker/runtime/graphdriver"
+	"github.com/dotcloud/docker/runtime/graphdriver/aufs"
+	_ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
+	_ "github.com/dotcloud/docker/runtime/graphdriver/devmapper"
+	_ "github.com/dotcloud/docker/runtime/graphdriver/vfs"
 	"github.com/dotcloud/docker/image"
 	_ "github.com/dotcloud/docker/runtime/networkdriver/lxc"
 	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"