diff --git a/apparmor/apparmor.go b/libcontainer/apparmor/apparmor.go
similarity index 100%
rename from apparmor/apparmor.go
rename to libcontainer/apparmor/apparmor.go
diff --git a/apparmor/apparmor_disabled.go b/libcontainer/apparmor/apparmor_disabled.go
similarity index 100%
rename from apparmor/apparmor_disabled.go
rename to libcontainer/apparmor/apparmor_disabled.go
diff --git a/apparmor/gen.go b/libcontainer/apparmor/gen.go
similarity index 100%
rename from apparmor/gen.go
rename to libcontainer/apparmor/gen.go
diff --git a/apparmor/setup.go b/libcontainer/apparmor/setup.go
similarity index 100%
rename from apparmor/setup.go
rename to libcontainer/apparmor/setup.go
diff --git a/libcontainer/console/console.go b/libcontainer/console/console.go
index 79a4804..ccab528 100644
--- a/libcontainer/console/console.go
+++ b/libcontainer/console/console.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/dotcloud/docker/pkg/label"
+	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	"github.com/dotcloud/docker/pkg/system"
 )
 
diff --git a/label/label.go b/libcontainer/label/label.go
similarity index 100%
rename from label/label.go
rename to libcontainer/label/label.go
diff --git a/label/label_selinux.go b/libcontainer/label/label_selinux.go
similarity index 96%
rename from label/label_selinux.go
rename to libcontainer/label/label_selinux.go
index 926f7ff..1ef8891 100644
--- a/label/label_selinux.go
+++ b/libcontainer/label/label_selinux.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dotcloud/docker/pkg/selinux"
+	"github.com/dotcloud/docker/pkg/libcontainer/selinux"
 )
 
 func GenLabels(options string) (string, string, error) {
diff --git a/libcontainer/mount/init.go b/libcontainer/mount/init.go
index af7a521..e7bf1fd 100644
--- a/libcontainer/mount/init.go
+++ b/libcontainer/mount/init.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/dotcloud/docker/pkg/label"
+	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
 	"github.com/dotcloud/docker/pkg/symlink"
diff --git a/libcontainer/namespaces/execin.go b/libcontainer/namespaces/execin.go
index 4d5671e..deacec3 100644
--- a/libcontainer/namespaces/execin.go
+++ b/libcontainer/namespaces/execin.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/dotcloud/docker/pkg/label"
+	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"github.com/dotcloud/docker/pkg/system"
 )
diff --git a/libcontainer/namespaces/init.go b/libcontainer/namespaces/init.go
index b53c566..3dc82f2 100644
--- a/libcontainer/namespaces/init.go
+++ b/libcontainer/namespaces/init.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/dotcloud/docker/pkg/apparmor"
-	"github.com/dotcloud/docker/pkg/label"
+	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
+	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"github.com/dotcloud/docker/pkg/libcontainer/console"
 	"github.com/dotcloud/docker/pkg/libcontainer/mount"
@@ -18,7 +18,7 @@ import (
 	"github.com/dotcloud/docker/pkg/libcontainer/security/capabilities"
 	"github.com/dotcloud/docker/pkg/libcontainer/security/restrict"
 	"github.com/dotcloud/docker/pkg/libcontainer/utils"
-	"github.com/dotcloud/docker/pkg/netlink"
+	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
 	"github.com/dotcloud/docker/pkg/system"
 	"github.com/dotcloud/docker/pkg/user"
 )
diff --git a/netlink/MAINTAINERS b/libcontainer/netlink/MAINTAINERS
similarity index 100%
rename from netlink/MAINTAINERS
rename to libcontainer/netlink/MAINTAINERS
diff --git a/netlink/netlink.go b/libcontainer/netlink/netlink.go
similarity index 100%
rename from netlink/netlink.go
rename to libcontainer/netlink/netlink.go
diff --git a/netlink/netlink_linux.go b/libcontainer/netlink/netlink_linux.go
similarity index 100%
rename from netlink/netlink_linux.go
rename to libcontainer/netlink/netlink_linux.go
diff --git a/netlink/netlink_unsupported.go b/libcontainer/netlink/netlink_unsupported.go
similarity index 100%
rename from netlink/netlink_unsupported.go
rename to libcontainer/netlink/netlink_unsupported.go
diff --git a/libcontainer/network/network.go b/libcontainer/network/network.go
index 85a28dc..75d0040 100644
--- a/libcontainer/network/network.go
+++ b/libcontainer/network/network.go
@@ -1,7 +1,7 @@
 package network
 
 import (
-	"github.com/dotcloud/docker/pkg/netlink"
+	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
 	"net"
 )
 
diff --git a/selinux/selinux.go b/libcontainer/selinux/selinux.go
similarity index 100%
rename from selinux/selinux.go
rename to libcontainer/selinux/selinux.go
diff --git a/selinux/selinux_test.go b/libcontainer/selinux/selinux_test.go
similarity index 96%
rename from selinux/selinux_test.go
rename to libcontainer/selinux/selinux_test.go
index 9a3a552..0e900c1 100644
--- a/selinux/selinux_test.go
+++ b/libcontainer/selinux/selinux_test.go
@@ -1,7 +1,7 @@
 package selinux_test
 
 import (
-	"github.com/dotcloud/docker/pkg/selinux"
+	"github.com/dotcloud/docker/pkg/libcontainer/selinux"
 	"os"
 	"testing"
 )