diff --git a/runtime/container.go b/runtime/container.go
index ee545db201..f4de40a16a 100644
--- a/runtime/container.go
+++ b/runtime/container.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/graphdriver"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/links"
diff --git a/execdriver/MAINTAINERS b/runtime/execdriver/MAINTAINERS
similarity index 100%
rename from execdriver/MAINTAINERS
rename to runtime/execdriver/MAINTAINERS
diff --git a/execdriver/driver.go b/runtime/execdriver/driver.go
similarity index 100%
rename from execdriver/driver.go
rename to runtime/execdriver/driver.go
diff --git a/execdriver/execdrivers/execdrivers.go b/runtime/execdriver/execdrivers/execdrivers.go
similarity index 79%
rename from execdriver/execdrivers/execdrivers.go
rename to runtime/execdriver/execdrivers/execdrivers.go
index 7486d649c1..29fa5b44f9 100644
--- a/execdriver/execdrivers/execdrivers.go
+++ b/runtime/execdriver/execdrivers/execdrivers.go
@@ -2,9 +2,9 @@ package execdrivers
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
-	"github.com/dotcloud/docker/execdriver/lxc"
-	"github.com/dotcloud/docker/execdriver/native"
+	"github.com/dotcloud/docker/runtime/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver/lxc"
+	"github.com/dotcloud/docker/runtime/execdriver/native"
 	"github.com/dotcloud/docker/pkg/sysinfo"
 	"path"
 )
diff --git a/execdriver/lxc/driver.go b/runtime/execdriver/lxc/driver.go
similarity index 99%
rename from execdriver/lxc/driver.go
rename to runtime/execdriver/lxc/driver.go
index 9abec8ac3f..fa2ecf9d77 100644
--- a/execdriver/lxc/driver.go
+++ b/runtime/execdriver/lxc/driver.go
@@ -2,7 +2,7 @@ package lxc
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"
diff --git a/execdriver/lxc/info.go b/runtime/execdriver/lxc/info.go
similarity index 100%
rename from execdriver/lxc/info.go
rename to runtime/execdriver/lxc/info.go
diff --git a/execdriver/lxc/info_test.go b/runtime/execdriver/lxc/info_test.go
similarity index 100%
rename from execdriver/lxc/info_test.go
rename to runtime/execdriver/lxc/info_test.go
diff --git a/execdriver/lxc/init.go b/runtime/execdriver/lxc/init.go
similarity index 98%
rename from execdriver/lxc/init.go
rename to runtime/execdriver/lxc/init.go
index 0f134088a3..946c8c930f 100644
--- a/execdriver/lxc/init.go
+++ b/runtime/execdriver/lxc/init.go
@@ -3,7 +3,7 @@ package lxc
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/pkg/netlink"
 	"github.com/dotcloud/docker/pkg/user"
 	"github.com/syndtr/gocapability/capability"
diff --git a/execdriver/lxc/lxc_init_linux.go b/runtime/execdriver/lxc/lxc_init_linux.go
similarity index 100%
rename from execdriver/lxc/lxc_init_linux.go
rename to runtime/execdriver/lxc/lxc_init_linux.go
diff --git a/execdriver/lxc/lxc_init_unsupported.go b/runtime/execdriver/lxc/lxc_init_unsupported.go
similarity index 100%
rename from execdriver/lxc/lxc_init_unsupported.go
rename to runtime/execdriver/lxc/lxc_init_unsupported.go
diff --git a/execdriver/lxc/lxc_template.go b/runtime/execdriver/lxc/lxc_template.go
similarity index 98%
rename from execdriver/lxc/lxc_template.go
rename to runtime/execdriver/lxc/lxc_template.go
index 84cd4e442e..db55287522 100644
--- a/execdriver/lxc/lxc_template.go
+++ b/runtime/execdriver/lxc/lxc_template.go
@@ -1,7 +1,7 @@
 package lxc
 
 import (
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"strings"
 	"text/template"
 )
diff --git a/execdriver/lxc/lxc_template_unit_test.go b/runtime/execdriver/lxc/lxc_template_unit_test.go
similarity index 98%
rename from execdriver/lxc/lxc_template_unit_test.go
rename to runtime/execdriver/lxc/lxc_template_unit_test.go
index 99d6e636f5..ae66371836 100644
--- a/execdriver/lxc/lxc_template_unit_test.go
+++ b/runtime/execdriver/lxc/lxc_template_unit_test.go
@@ -3,7 +3,7 @@ package lxc
 import (
 	"bufio"
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"io/ioutil"
 	"math/rand"
 	"os"
diff --git a/execdriver/native/default_template.go b/runtime/execdriver/native/default_template.go
similarity index 98%
rename from execdriver/native/default_template.go
rename to runtime/execdriver/native/default_template.go
index 5351911427..0c382059e9 100644
--- a/execdriver/native/default_template.go
+++ b/runtime/execdriver/native/default_template.go
@@ -2,7 +2,7 @@ package native
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"os"
diff --git a/execdriver/native/driver.go b/runtime/execdriver/native/driver.go
similarity index 99%
rename from execdriver/native/driver.go
rename to runtime/execdriver/native/driver.go
index 9b49fd156f..ff6c541cf9 100644
--- a/execdriver/native/driver.go
+++ b/runtime/execdriver/native/driver.go
@@ -3,7 +3,7 @@ package native
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
diff --git a/execdriver/native/info.go b/runtime/execdriver/native/info.go
similarity index 100%
rename from execdriver/native/info.go
rename to runtime/execdriver/native/info.go
diff --git a/execdriver/native/term.go b/runtime/execdriver/native/term.go
similarity index 94%
rename from execdriver/native/term.go
rename to runtime/execdriver/native/term.go
index ec69820f75..0d5298d388 100644
--- a/execdriver/native/term.go
+++ b/runtime/execdriver/native/term.go
@@ -5,7 +5,7 @@
 package native
 
 import (
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"io"
 	"os"
 	"os/exec"
diff --git a/execdriver/pipes.go b/runtime/execdriver/pipes.go
similarity index 100%
rename from execdriver/pipes.go
rename to runtime/execdriver/pipes.go
diff --git a/execdriver/termconsole.go b/runtime/execdriver/termconsole.go
similarity index 100%
rename from execdriver/termconsole.go
rename to runtime/execdriver/termconsole.go
diff --git a/runtime/runtime.go b/runtime/runtime.go
index 092b5a8130..f75a4df048 100644
--- a/runtime/runtime.go
+++ b/runtime/runtime.go
@@ -7,9 +7,9 @@ import (
 	"github.com/dotcloud/docker/daemonconfig"
 	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/execdriver"
-	"github.com/dotcloud/docker/execdriver/execdrivers"
-	"github.com/dotcloud/docker/execdriver/lxc"
+	"github.com/dotcloud/docker/runtime/execdriver"
+	"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"
diff --git a/runtime/volumes.go b/runtime/volumes.go
index 9cb66aae44..1bbb14a369 100644
--- a/runtime/volumes.go
+++ b/runtime/volumes.go
@@ -3,7 +3,7 @@ package runtime
 import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/runtime/execdriver"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"
 	"os"
diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go
index 56508b105d..50c858296f 100644
--- a/sysinit/sysinit.go
+++ b/sysinit/sysinit.go
@@ -3,9 +3,9 @@ package sysinit
 import (
 	"flag"
 	"fmt"
-	"github.com/dotcloud/docker/execdriver"
-	_ "github.com/dotcloud/docker/execdriver/lxc"
-	_ "github.com/dotcloud/docker/execdriver/native"
+	"github.com/dotcloud/docker/runtime/execdriver"
+	_ "github.com/dotcloud/docker/runtime/execdriver/lxc"
+	_ "github.com/dotcloud/docker/runtime/execdriver/native"
 	"log"
 	"os"
 )