diff --git a/aufs/aufs.go b/graphdriver/aufs/aufs.go
similarity index 100%
rename from aufs/aufs.go
rename to graphdriver/aufs/aufs.go
diff --git a/aufs/aufs_test.go b/graphdriver/aufs/aufs_test.go
similarity index 100%
rename from aufs/aufs_test.go
rename to graphdriver/aufs/aufs_test.go
diff --git a/aufs/dirs.go b/graphdriver/aufs/dirs.go
similarity index 100%
rename from aufs/dirs.go
rename to graphdriver/aufs/dirs.go
diff --git a/aufs/mount.go b/graphdriver/aufs/mount.go
similarity index 100%
rename from aufs/mount.go
rename to graphdriver/aufs/mount.go
diff --git a/aufs/mount_darwin.go b/graphdriver/aufs/mount_darwin.go
similarity index 100%
rename from aufs/mount_darwin.go
rename to graphdriver/aufs/mount_darwin.go
diff --git a/aufs/mount_linux.go b/graphdriver/aufs/mount_linux.go
similarity index 100%
rename from aufs/mount_linux.go
rename to graphdriver/aufs/mount_linux.go
diff --git a/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go
similarity index 100%
rename from devmapper/deviceset.go
rename to graphdriver/devmapper/deviceset.go
diff --git a/devmapper/devmapper.go b/graphdriver/devmapper/devmapper.go
similarity index 100%
rename from devmapper/devmapper.go
rename to graphdriver/devmapper/devmapper.go
diff --git a/devmapper/devmapper_log.go b/graphdriver/devmapper/devmapper_log.go
similarity index 100%
rename from devmapper/devmapper_log.go
rename to graphdriver/devmapper/devmapper_log.go
diff --git a/devmapper/devmapper_test.go b/graphdriver/devmapper/devmapper_test.go
similarity index 100%
rename from devmapper/devmapper_test.go
rename to graphdriver/devmapper/devmapper_test.go
diff --git a/devmapper/devmapper_wrapper.go b/graphdriver/devmapper/devmapper_wrapper.go
similarity index 100%
rename from devmapper/devmapper_wrapper.go
rename to graphdriver/devmapper/devmapper_wrapper.go
diff --git a/devmapper/docker-device-tool/device_tool.go b/graphdriver/devmapper/docker-device-tool/device_tool.go
similarity index 100%
rename from devmapper/docker-device-tool/device_tool.go
rename to graphdriver/devmapper/docker-device-tool/device_tool.go
diff --git a/devmapper/driver.go b/graphdriver/devmapper/driver.go
similarity index 100%
rename from devmapper/driver.go
rename to graphdriver/devmapper/driver.go
diff --git a/devmapper/driver_test.go b/graphdriver/devmapper/driver_test.go
similarity index 100%
rename from devmapper/driver_test.go
rename to graphdriver/devmapper/driver_test.go
diff --git a/devmapper/mount.go b/graphdriver/devmapper/mount.go
similarity index 100%
rename from devmapper/mount.go
rename to graphdriver/devmapper/mount.go
diff --git a/runtime.go b/runtime.go
index 57e5498ff4..806ae69ed3 100644
--- a/runtime.go
+++ b/runtime.go
@@ -6,10 +6,10 @@ import (
 	"database/sql"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	_ "github.com/dotcloud/docker/aufs"
-	_ "github.com/dotcloud/docker/devmapper"
 	"github.com/dotcloud/docker/gograph"
 	"github.com/dotcloud/docker/graphdriver"
+	_ "github.com/dotcloud/docker/graphdriver/aufs"
+	_ "github.com/dotcloud/docker/graphdriver/devmapper"
 	_ "github.com/dotcloud/docker/graphdriver/dummy"
 	"github.com/dotcloud/docker/utils"
 	"io"