diff --git a/container.go b/container.go
index d054bcf50d..361dfeaf67 100644
--- a/container.go
+++ b/container.go
@@ -8,6 +8,7 @@ import (
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/execdriver"
 	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/links"
 	"github.com/dotcloud/docker/nat"
 	"github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/pkg/term"
@@ -71,7 +72,7 @@ type Container struct {
 	VolumesRW  map[string]bool
 	hostConfig *runconfig.HostConfig
 
-	activeLinks map[string]*Link
+	activeLinks map[string]*links.Link
 }
 
 type BindMap struct {
@@ -537,7 +538,7 @@ func (container *Container) Start() (err error) {
 	}
 
 	if len(children) > 0 {
-		container.activeLinks = make(map[string]*Link, len(children))
+		container.activeLinks = make(map[string]*links.Link, len(children))
 
 		// If we encounter an error make sure that we rollback any network
 		// config and ip table changes
@@ -553,7 +554,7 @@ func (container *Container) Start() (err error) {
 				return fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
 			}
 
-			link, err := NewLink(
+			link, err := links.NewLink(
 				container.NetworkSettings.IPAddress,
 				child.NetworkSettings.IPAddress,
 				linkAlias,
diff --git a/links.go b/links/links.go
similarity index 99%
rename from links.go
rename to links/links.go
index 1a198b0814..68ac98ee07 100644
--- a/links.go
+++ b/links/links.go
@@ -1,4 +1,4 @@
-package docker
+package links
 
 import (
 	"fmt"
diff --git a/links_test.go b/links/links_test.go
similarity index 99%
rename from links_test.go
rename to links/links_test.go
index d84fe04061..e66f9bfb78 100644
--- a/links_test.go
+++ b/links/links_test.go
@@ -1,4 +1,4 @@
-package docker
+package links
 
 import (
 	"github.com/dotcloud/docker/nat"