diff --git a/builtins/builtins.go b/builtins/builtins.go
index eb4a0be874..86f3973c62 100644
--- a/builtins/builtins.go
+++ b/builtins/builtins.go
@@ -4,7 +4,7 @@ import (
 	"github.com/dotcloud/docker/engine"
 
 	"github.com/dotcloud/docker/api"
-	"github.com/dotcloud/docker/networkdriver/lxc"
+	"github.com/dotcloud/docker/runtime/networkdriver/lxc"
 	"github.com/dotcloud/docker/server"
 )
 
diff --git a/daemonconfig/config.go b/daemonconfig/config.go
index 0aee7e78ba..b26d3eec3a 100644
--- a/daemonconfig/config.go
+++ b/daemonconfig/config.go
@@ -4,7 +4,7 @@ import (
 	"net"
 
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver"
 )
 
 const (
diff --git a/networkdriver/ipallocator/allocator.go b/runtime/networkdriver/ipallocator/allocator.go
similarity index 98%
rename from networkdriver/ipallocator/allocator.go
rename to runtime/networkdriver/ipallocator/allocator.go
index 1c5a7b4cc2..2950e37003 100644
--- a/networkdriver/ipallocator/allocator.go
+++ b/runtime/networkdriver/ipallocator/allocator.go
@@ -3,7 +3,7 @@ package ipallocator
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/dotcloud/docker/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver"
 	"github.com/dotcloud/docker/pkg/collections"
 	"net"
 	"sync"
diff --git a/networkdriver/ipallocator/allocator_test.go b/runtime/networkdriver/ipallocator/allocator_test.go
similarity index 100%
rename from networkdriver/ipallocator/allocator_test.go
rename to runtime/networkdriver/ipallocator/allocator_test.go
diff --git a/networkdriver/lxc/driver.go b/runtime/networkdriver/lxc/driver.go
similarity index 98%
rename from networkdriver/lxc/driver.go
rename to runtime/networkdriver/lxc/driver.go
index 6185c42752..746bcfb5b0 100644
--- a/networkdriver/lxc/driver.go
+++ b/runtime/networkdriver/lxc/driver.go
@@ -3,10 +3,10 @@ package lxc
 import (
 	"fmt"
 	"github.com/dotcloud/docker/engine"
-	"github.com/dotcloud/docker/networkdriver"
-	"github.com/dotcloud/docker/networkdriver/ipallocator"
-	"github.com/dotcloud/docker/networkdriver/portallocator"
-	"github.com/dotcloud/docker/networkdriver/portmapper"
+	"github.com/dotcloud/docker/runtime/networkdriver"
+	"github.com/dotcloud/docker/runtime/networkdriver/ipallocator"
+	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
+	"github.com/dotcloud/docker/runtime/networkdriver/portmapper"
 	"github.com/dotcloud/docker/pkg/iptables"
 	"github.com/dotcloud/docker/pkg/netlink"
 	"github.com/dotcloud/docker/utils"
diff --git a/networkdriver/network.go b/runtime/networkdriver/network.go
similarity index 100%
rename from networkdriver/network.go
rename to runtime/networkdriver/network.go
diff --git a/networkdriver/network_test.go b/runtime/networkdriver/network_test.go
similarity index 100%
rename from networkdriver/network_test.go
rename to runtime/networkdriver/network_test.go
diff --git a/networkdriver/portallocator/portallocator.go b/runtime/networkdriver/portallocator/portallocator.go
similarity index 100%
rename from networkdriver/portallocator/portallocator.go
rename to runtime/networkdriver/portallocator/portallocator.go
diff --git a/networkdriver/portallocator/portallocator_test.go b/runtime/networkdriver/portallocator/portallocator_test.go
similarity index 100%
rename from networkdriver/portallocator/portallocator_test.go
rename to runtime/networkdriver/portallocator/portallocator_test.go
diff --git a/networkdriver/portmapper/mapper.go b/runtime/networkdriver/portmapper/mapper.go
similarity index 100%
rename from networkdriver/portmapper/mapper.go
rename to runtime/networkdriver/portmapper/mapper.go
diff --git a/networkdriver/portmapper/mapper_test.go b/runtime/networkdriver/portmapper/mapper_test.go
similarity index 100%
rename from networkdriver/portmapper/mapper_test.go
rename to runtime/networkdriver/portmapper/mapper_test.go
diff --git a/networkdriver/utils.go b/runtime/networkdriver/utils.go
similarity index 100%
rename from networkdriver/utils.go
rename to runtime/networkdriver/utils.go
diff --git a/runtime/runtime.go b/runtime/runtime.go
index 32584cbf6e..092b5a8130 100644
--- a/runtime/runtime.go
+++ b/runtime/runtime.go
@@ -17,8 +17,8 @@ import (
 	_ "github.com/dotcloud/docker/graphdriver/devmapper"
 	_ "github.com/dotcloud/docker/graphdriver/vfs"
 	"github.com/dotcloud/docker/image"
-	_ "github.com/dotcloud/docker/networkdriver/lxc"
-	"github.com/dotcloud/docker/networkdriver/portallocator"
+	_ "github.com/dotcloud/docker/runtime/networkdriver/lxc"
+	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
 	"github.com/dotcloud/docker/pkg/graphdb"
 	"github.com/dotcloud/docker/pkg/sysinfo"
 	"github.com/dotcloud/docker/runconfig"