diff --git a/.travis.yml b/.travis.yml
index 13feb8f78a..eda4701cac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 go:
-  - 1.4
-  - 1.5
+  - 1.6
 
 install:
  - go get golang.org/x/tools/cmd/cover 
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0aa80fde76..123d951563 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/coreos/flannel",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.6.2",
 	"Packages": [
 		"./..."
 	],
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d56..0000000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d684ef..0000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/backend/alloc/alloc.go b/backend/alloc/alloc.go
index 4ce469cf22..a9278994f7 100644
--- a/backend/alloc/alloc.go
+++ b/backend/alloc/alloc.go
@@ -17,7 +17,7 @@ package alloc
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
diff --git a/backend/awsvpc/awsvpc.go b/backend/awsvpc/awsvpc.go
index 5eac59c439..d418bbdab6 100644
--- a/backend/awsvpc/awsvpc.go
+++ b/backend/awsvpc/awsvpc.go
@@ -18,12 +18,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/awsvpc/filter.go b/backend/awsvpc/filter.go
index 3fe858a517..79ba0abf31 100644
--- a/backend/awsvpc/filter.go
+++ b/backend/awsvpc/filter.go
@@ -14,7 +14,7 @@
 
 package awsvpc
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+import "github.com/aws/aws-sdk-go/service/ec2"
 
 type ecFilter []*ec2.Filter
 
diff --git a/backend/common.go b/backend/common.go
index db992d2dda..a7e4bc80b0 100644
--- a/backend/common.go
+++ b/backend/common.go
@@ -17,7 +17,7 @@ package backend
 import (
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )
diff --git a/backend/gce/api.go b/backend/gce/api.go
index 2235fafea3..42f05639a6 100644
--- a/backend/gce/api.go
+++ b/backend/gce/api.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount"
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"code.google.com/p/goauth2/compute/serviceaccount"
+	"code.google.com/p/google-api-go-client/compute/v1"
+	log "github.com/golang/glog"
 )
 
 type gceAPI struct {
diff --git a/backend/gce/gce.go b/backend/gce/gce.go
index a392496cb9..de70a9d3ef 100644
--- a/backend/gce/gce.go
+++ b/backend/gce/gce.go
@@ -42,9 +42,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"code.google.com/p/google-api-go-client/googleapi"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/hostgw/hostgw.go b/backend/hostgw/hostgw.go
index 8e91730f59..8e5d5d20f8 100644
--- a/backend/hostgw/hostgw.go
+++ b/backend/hostgw/hostgw.go
@@ -17,7 +17,7 @@ package hostgw
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
diff --git a/backend/hostgw/network.go b/backend/hostgw/network.go
index 3b7252c6a3..0a847269f8 100644
--- a/backend/hostgw/network.go
+++ b/backend/hostgw/network.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"
diff --git a/backend/manager.go b/backend/manager.go
index bba256a469..6abc08d6df 100644
--- a/backend/manager.go
+++ b/backend/manager.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )
diff --git a/backend/udp/cproxy.go b/backend/udp/cproxy.go
index 9b6756743b..bf65afd5fd 100644
--- a/backend/udp/cproxy.go
+++ b/backend/udp/cproxy.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/backend/udp/network.go b/backend/udp/network.go
index 1e4ef0611a..aa7c2e4687 100644
--- a/backend/udp/network.go
+++ b/backend/udp/network.go
@@ -21,9 +21,9 @@ import (
 	"sync"
 	"syscall"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/udp/udp.go b/backend/udp/udp.go
index 2e86b11c9b..aae28e2cc9 100644
--- a/backend/udp/udp.go
+++ b/backend/udp/udp.go
@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
index 2d4e088702..4021681254 100644
--- a/backend/vxlan/device.go
+++ b/backend/vxlan/device.go
@@ -21,9 +21,9 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink/nl"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/backend/vxlan/network.go b/backend/vxlan/network.go
index 9e73267ebe..db5043a8ec 100644
--- a/backend/vxlan/network.go
+++ b/backend/vxlan/network.go
@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
index 1d797eb613..98602645b8 100644
--- a/backend/vxlan/vxlan.go
+++ b/backend/vxlan/vxlan.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/main.go b/main.go
index b1a5f6aff5..77a5f9ddbf 100644
--- a/main.go
+++ b/main.go
@@ -23,9 +23,9 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/pkg/flagutil"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/pkg/flagutil"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/network"
 	"github.com/coreos/flannel/remote"
diff --git a/network/ipmasq.go b/network/ipmasq.go
index b215ea711e..4959e9b3af 100644
--- a/network/ipmasq.go
+++ b/network/ipmasq.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/coreos/go-iptables/iptables"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/network/manager.go b/network/manager.go
index 5a0147f4b9..cf1476aab8 100644
--- a/network/manager.go
+++ b/network/manager.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/network/network.go b/network/network.go
index 23a34bcd2b..f2f55bea22 100644
--- a/network/network.go
+++ b/network/network.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"
diff --git a/pkg/ip/iface.go b/pkg/ip/iface.go
index 32fcfc2912..a5e2da31f1 100644
--- a/pkg/ip/iface.go
+++ b/pkg/ip/iface.go
@@ -19,7 +19,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink"
 )
 
 func getIfaceAddrs(iface *net.Interface) ([]netlink.Addr, error) {
diff --git a/remote/client.go b/remote/client.go
index 0c3e014eea..770855b958 100644
--- a/remote/client.go
+++ b/remote/client.go
@@ -25,8 +25,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
diff --git a/remote/http_logger.go b/remote/http_logger.go
index 7853535c71..7795333f22 100644
--- a/remote/http_logger.go
+++ b/remote/http_logger.go
@@ -15,7 +15,7 @@
 package remote
 
 import (
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 	"net/http"
 )
 
diff --git a/remote/remote_test.go b/remote/remote_test.go
index a20a7ac6f2..79edb1967d 100644
--- a/remote/remote_test.go
+++ b/remote/remote_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
diff --git a/remote/server.go b/remote/server.go
index 6d8e3bed84..a71b978e57 100644
--- a/remote/server.go
+++ b/remote/server.go
@@ -24,12 +24,12 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/mux"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"github.com/coreos/go-systemd/activation"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )
diff --git a/subnet/clock.go b/subnet/clock.go
index 439394314d..582b552eef 100644
--- a/subnet/clock.go
+++ b/subnet/clock.go
@@ -14,6 +14,6 @@
 
 package subnet
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/jonboulle/clockwork"
+import "github.com/jonboulle/clockwork"
 
 var clock clockwork.Clock = clockwork.NewRealClock()
diff --git a/subnet/local_manager.go b/subnet/local_manager.go
index e2e0b06aca..df9aa64b63 100644
--- a/subnet/local_manager.go
+++ b/subnet/local_manager.go
@@ -20,10 +20,10 @@ import (
 	"strconv"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/flannel/pkg/ip"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 )
 
 const (
diff --git a/subnet/mock_etcd.go b/subnet/mock_etcd.go
index 00bc4dbb6a..8c118eeef4 100644
--- a/subnet/mock_etcd.go
+++ b/subnet/mock_etcd.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 const DEFAULT_TTL time.Duration = 8760 * time.Hour // one year
diff --git a/subnet/mock_etcd_test.go b/subnet/mock_etcd_test.go
index a57b5bc7e9..e95ce4e7bb 100644
--- a/subnet/mock_etcd_test.go
+++ b/subnet/mock_etcd_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 func expectSuccess(t *testing.T, r *etcd.Response, err error, expected *etcd.Response, expectedValue string) {
diff --git a/subnet/mock_registry.go b/subnet/mock_registry.go
index 27f9bff22d..521994d8a3 100644
--- a/subnet/mock_registry.go
+++ b/subnet/mock_registry.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/subnet/registry.go b/subnet/registry.go
index 5f09bf3692..ba0cd5e50f 100644
--- a/subnet/registry.go
+++ b/subnet/registry.go
@@ -23,10 +23,10 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"github.com/coreos/etcd/pkg/transport"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/subnet/registry_test.go b/subnet/registry_test.go
index 035c3002c6..8d7524f1e3 100644
--- a/subnet/registry_test.go
+++ b/subnet/registry_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/subnet/subnet.go b/subnet/subnet.go
index 7a0e63a1e6..659c3d5e28 100644
--- a/subnet/subnet.go
+++ b/subnet/subnet.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/flannel/pkg/ip"
+	"golang.org/x/net/context"
 )
 
 var (
diff --git a/subnet/subnet_test.go b/subnet/subnet_test.go
index 4de0055bcd..f52d863d7f 100644
--- a/subnet/subnet_test.go
+++ b/subnet/subnet_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/jonboulle/clockwork"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"github.com/jonboulle/clockwork"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/subnet/watch.go b/subnet/watch.go
index d1e3ec588b..ccd02554c7 100644
--- a/subnet/watch.go
+++ b/subnet/watch.go
@@ -17,8 +17,8 @@ package subnet
 import (
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
diff --git a/test b/test
index a6c456b3fd..20e6c7161b 100755
--- a/test
+++ b/test
@@ -48,7 +48,7 @@ if [ -n "${fmtRes}" ]; then
 fi
 
 echo "Checking for license header..."
-licRes=$(for file in $(find . -type f -iname '*.go' ! -path './Godeps/*'); do
+licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do
 		head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e "  ${file}"
 	done;)
 if [ -n "${licRes}" ]; then
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go b/vendor/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
similarity index 98%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
rename to vendor/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
index 752193a777..ed3e10cf5f 100644
--- a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
+++ b/vendor/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 const (
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go b/vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go
similarity index 97%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
rename to vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go
index b33e51a71d..f9651bd090 100644
--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
+++ b/vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go
@@ -13,7 +13,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 var (
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json b/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
rename to vendor/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem b/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.pem
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem
rename to vendor/code.google.com/p/goauth2/oauth/jwt/example/example.pem
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go b/vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go
similarity index 97%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
rename to vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go
index e9be317ced..2256e9c621 100644
--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
+++ b/vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go
@@ -16,7 +16,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt"
+	"code.google.com/p/goauth2/oauth/jwt"
 )
 
 const scope = "https://www.googleapis.com/auth/devstorage.read_only"
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go b/vendor/code.google.com/p/goauth2/oauth/jwt/jwt.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
rename to vendor/code.google.com/p/goauth2/oauth/jwt/jwt.go
index 68dcdd3b38..61bf5ce936 100644
--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
+++ b/vendor/code.google.com/p/goauth2/oauth/jwt/jwt.go
@@ -50,7 +50,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 // These are the default/standard values for this to work for Google service accounts.
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go b/vendor/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
rename to vendor/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go b/vendor/code.google.com/p/goauth2/oauth/oauth.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go
rename to vendor/code.google.com/p/goauth2/oauth/oauth.go
diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go b/vendor/code.google.com/p/goauth2/oauth/oauth_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go
rename to vendor/code.google.com/p/goauth2/oauth/oauth_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json b/vendor/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
rename to vendor/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go b/vendor/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
rename to vendor/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
index ba80b7a162..888d01df74 100644
--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
+++ b/vendor/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
@@ -14,7 +14,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi"
+	"code.google.com/p/google-api-go-client/googleapi"
 	"io"
 	"net/http"
 	"net/url"
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go b/vendor/code.google.com/p/google-api-go-client/googleapi/googleapi.go
similarity index 98%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/googleapi.go
index 7a0df3d616..d6e5cd83fb 100644
--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
+++ b/vendor/code.google.com/p/google-api-go-client/googleapi/googleapi.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
+	"code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
 )
 
 // ContentTyper is an interface for Readers which know (or would like
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go b/vendor/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE b/vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
rename to vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go b/vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go b/vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go b/vendor/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go b/vendor/code.google.com/p/google-api-go-client/googleapi/types.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/types.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go b/vendor/code.google.com/p/google-api-go-client/googleapi/types_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
rename to vendor/code.google.com/p/google-api-go-client/googleapi/types_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
index 48e5127284..4f26241a2b 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
index d811b84ed1..0da6b06fdd 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
@@ -3,7 +3,7 @@ package awsutil_test
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
rename to vendor/github.com/aws/aws-sdk-go/aws/config.go
index 8124777664..a72f702229 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/config.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 // The default number of retries for a service. The value of -1 indicates that
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config_test.go b/vendor/github.com/aws/aws-sdk-go/aws/config_test.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/config_test.go
index 9448755160..c4320ca1ed 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/config_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 var testCredentials = credentials.NewStaticCredentials("AKID", "SECRET", "SESSION")
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types_test.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/convert_types_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
index 4de0656797..d0962b051e 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // Interface for matching types which also have a Len method.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go
similarity index 83%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go
index 4936b60091..214adcab08 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/corehandlers"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
 )
 
 func TestValidateEndpointHandler(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
similarity index 92%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
index 6bf3328136..d7019eb877 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // ValidateParameters is a request handler to validate the input parameters.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go
similarity index 82%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go
index 63bccf0945..674fe96ff5 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go
@@ -5,12 +5,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/corehandlers"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 var testSvc = func() *service.Service {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
index 587ff8392f..7f509ca83c 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
index fcd7d9bdf1..4fba22f29f 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
@@ -3,7 +3,7 @@ package credentials
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
index c708b239be..99c2b47742 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
@@ -3,7 +3,7 @@ package credentials
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
index 2a2dfea4a8..946a117206 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 )
 
 // A EC2RoleProvider retrieves credentials from the EC2 service, and keeps track if
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go
similarity index 92%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go
index 7397e0a95a..cd0cbc97e0 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 )
 
 const credsRespTmpl = `{
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
index 692fe10276..043e861d6f 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
@@ -3,7 +3,7 @@ package credentials
 import (
 	"os"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
index 72ee032e4e..fac6d78c41 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vaughan0/go-ini"
+	"github.com/vaughan0/go-ini"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
similarity index 92%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
index dc0f094379..530a9ac2f3 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
index 8eaff9466f..d0c071f43f 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 // AssumeRoler represents the minimal subset of the STS client API used by this provider.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
index 22e9426d3e..6388b5edea 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
similarity index 82%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
rename to vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
index dae141b7de..2f161b57f1 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 )
 
 // DefaultChainCredentials is a Credentials which will find the first available
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
similarity index 92%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
index 0b5dcf8877..9d784b6e6a 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
@@ -3,7 +3,7 @@ package ec2metadata
 import (
 	"path"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // GetMetadata uses the path provided to request
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go
similarity index 87%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go
index 166359f373..61ab62a530 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 func initTestServer(path string, resp string) *httptest.Server {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
similarity index 86%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
index 590e592453..d230df6f9f 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
@@ -4,12 +4,12 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 // DefaultRetries states the default number of times the service client will
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
similarity index 83%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
rename to vendor/github.com/aws/aws-sdk-go/aws/errors.go
index 3c175dfe94..db2f481b01 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
@@ -1,6 +1,6 @@
 package aws
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+import "github.com/aws/aws-sdk-go/aws/awserr"
 
 var (
 	// ErrMissingRegion is an error that is returned if region configuration is
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
rename to vendor/github.com/aws/aws-sdk-go/aws/logger.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers_test.go
similarity index 85%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/handlers_test.go
index 9cf3df49f8..2ff05a8154 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 func TestHandlerList(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/request.go
index 7d91f705d0..70c28b8831 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 // A Request is the service request to be made.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go
index a3adc504dd..7837ebfd8f 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/internal/test/unit"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 var _ = unit.Imported
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_test.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/request_test.go
index 619e1df739..6cea0bd2ff 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_test.go
@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
index a3e0004728..f03b0c6596 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
@@ -3,7 +3,7 @@ package request
 import (
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 // Retryer is an interface to control retry logic for a given service.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/service/default_retryer.go
similarity index 89%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/default_retryer.go
rename to vendor/github.com/aws/aws-sdk-go/aws/service/default_retryer.go
index fe4aa47bb4..e642d16b71 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/default_retryer.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/service/default_retryer.go
@@ -5,8 +5,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // DefaultRetryer implements basic retry logic using exponential backoff for
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/service.go b/vendor/github.com/aws/aws-sdk-go/aws/service/service.go
similarity index 89%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/service.go
rename to vendor/github.com/aws/aws-sdk-go/aws/service/service.go
index 04192b569c..7205212e19 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/service/service.go
@@ -8,11 +8,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/corehandlers"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/internal/endpoints"
 )
 
 // A Service implements the base service request and response handling
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go b/vendor/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go
similarity index 77%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go
rename to vendor/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go
index 98c1bb456e..a920e96a96 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/service/serviceinfo/service_info.go
@@ -1,6 +1,6 @@
 package serviceinfo
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
+import "github.com/aws/aws-sdk-go/aws"
 
 // ServiceInfo wraps immutable data from the service.Service structure.
 type ServiceInfo struct {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types_test.go b/vendor/github.com/aws/aws-sdk-go/aws/types_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/types_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
rename to vendor/github.com/aws/aws-sdk-go/aws/version.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go
similarity index 75%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go
index a53afff32c..fabe9b3c30 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build.go
@@ -6,9 +6,9 @@ package ec2query
 import (
 	"net/url"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/internal/protocol/query/queryutil"
 )
 
 // Build builds a request for the EC2 protocol.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go
index 3b8939d48b..1f3e2a251e 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/build_test.go
@@ -12,14 +12,14 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/internal/util"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/defaults"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/internal/protocol/ec2query"
+	"github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
+	"github.com/aws/aws-sdk-go/internal/signer/v4"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go
similarity index 83%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go
index 4ae51dc85d..bb0f015888 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal.go
@@ -6,9 +6,9 @@ import (
 	"encoding/xml"
 	"io"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
 )
 
 // Unmarshal unmarshals a response body for the EC2 protocol.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go
index 84c2f0ff61..e6f40a1631 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/ec2query/unmarshal_test.go
@@ -12,14 +12,14 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/internal/util"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/defaults"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/internal/protocol/ec2query"
+	"github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil"
+	"github.com/aws/aws-sdk-go/internal/signer/v4"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
index 5611ec6349..326e96cc62 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // RFC822 returns an RFC822 formatted timestamp for AWS protocols
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
index 5232e092cb..06d9accbac 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // Unmarshal unmarshals the REST component of a response in a REST service.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
similarity index 93%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
index 3063e3ff3d..52c5051768 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/internal/test/unit"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
index 70abfbc00d..fc7bc35350 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
@@ -14,10 +14,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/internal/protocol/rest"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
similarity index 95%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
index 159f286d09..0ba9ff25f7 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
index 9a5fb7b2a1..7bd88cb5c8 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
@@ -6,8 +6,8 @@ package ec2
 import (
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 const opAcceptVpcPeeringConnection = "AcceptVpcPeeringConnection"
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/customizations.go
similarity index 88%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/customizations.go
index 249ea5fc86..99f0820477 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/customizations.go
@@ -3,8 +3,8 @@ package ec2
 import (
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 func init() {
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go
similarity index 83%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go
index e1d804643b..166aa77806 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/internal/test/unit"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
index 24890d5f30..e10a2aa1f8 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
@@ -4,8 +4,8 @@
 package ec2iface
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
 // EC2API is the interface type for ec2.EC2.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go
similarity index 56%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go
index 749f639c64..3941d260db 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface_test.go
@@ -5,8 +5,8 @@ package ec2iface_test
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/examples_test.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/examples_test.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/examples_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/examples_test.go
index 0522eb01c5..81c1e9e694 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/examples_test.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/examples_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
 var _ time.Duration
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/service.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go
similarity index 70%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/service.go
index 4d41f8772b..102c8fe026 100644
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go
@@ -3,13 +3,13 @@
 package ec2
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/ec2query"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/defaults"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/internal/protocol/ec2query"
+	"github.com/aws/aws-sdk-go/internal/signer/v4"
 )
 
 // Amazon Elastic Compute Cloud (Amazon EC2) provides resizable computing capacity
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_role.go b/vendor/github.com/coreos/etcd/client/auth_role.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/auth_role.go
rename to vendor/github.com/coreos/etcd/client/auth_role.go
index 46f393b617..8de58afcf1 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_role.go
+++ b/vendor/github.com/coreos/etcd/client/auth_role.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 type Role struct {
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_user.go b/vendor/github.com/coreos/etcd/client/auth_user.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/auth_user.go
rename to vendor/github.com/coreos/etcd/client/auth_user.go
index e977a2eabb..6e0e4c596c 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_user.go
+++ b/vendor/github.com/coreos/etcd/client/auth_user.go
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq.go b/vendor/github.com/coreos/etcd/client/cancelreq.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq.go
rename to vendor/github.com/coreos/etcd/client/cancelreq.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq_go14.go b/vendor/github.com/coreos/etcd/client/cancelreq_go14.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq_go14.go
rename to vendor/github.com/coreos/etcd/client/cancelreq_go14.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/client.go b/vendor/github.com/coreos/etcd/client/client.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
rename to vendor/github.com/coreos/etcd/client/client.go
index a4c9373c71..34adb82b02 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
+++ b/vendor/github.com/coreos/etcd/client/client.go
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/client_test.go b/vendor/github.com/coreos/etcd/client/client_test.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/client_test.go
rename to vendor/github.com/coreos/etcd/client/client_test.go
index 1a90014676..b2b46d1b12 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/client_test.go
+++ b/vendor/github.com/coreos/etcd/client/client_test.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/pkg/testutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 type actionAssertingHTTPClient struct {
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/cluster_error.go b/vendor/github.com/coreos/etcd/client/cluster_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/cluster_error.go
rename to vendor/github.com/coreos/etcd/client/cluster_error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/curl.go b/vendor/github.com/coreos/etcd/client/curl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/curl.go
rename to vendor/github.com/coreos/etcd/client/curl.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/discover.go b/vendor/github.com/coreos/etcd/client/discover.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/discover.go
rename to vendor/github.com/coreos/etcd/client/discover.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/doc.go b/vendor/github.com/coreos/etcd/client/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/doc.go
rename to vendor/github.com/coreos/etcd/client/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys.go b/vendor/github.com/coreos/etcd/client/keys.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/keys.go
rename to vendor/github.com/coreos/etcd/client/keys.go
index 8af04a7a31..a71648ce92 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys.go
+++ b/vendor/github.com/coreos/etcd/client/keys.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/pathutil"
+	"golang.org/x/net/context"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys_test.go b/vendor/github.com/coreos/etcd/client/keys_test.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/keys_test.go
rename to vendor/github.com/coreos/etcd/client/keys_test.go
index a198a5ea28..80d7a554c0 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys_test.go
+++ b/vendor/github.com/coreos/etcd/client/keys_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 func TestV2KeysURLHelper(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/members.go b/vendor/github.com/coreos/etcd/client/members.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/members.go
rename to vendor/github.com/coreos/etcd/client/members.go
index b7c0f14f8b..56922f9e49 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/members.go
+++ b/vendor/github.com/coreos/etcd/client/members.go
@@ -22,8 +22,8 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/types"
+	"golang.org/x/net/context"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/members_test.go b/vendor/github.com/coreos/etcd/client/members_test.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/members_test.go
rename to vendor/github.com/coreos/etcd/client/members_test.go
index cdc78854ea..924ecf27d4 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/client/members_test.go
+++ b/vendor/github.com/coreos/etcd/client/members_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/types"
+	"golang.org/x/net/context"
 )
 
 func TestMembersAPIActionList(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/srv.go b/vendor/github.com/coreos/etcd/client/srv.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/srv.go
rename to vendor/github.com/coreos/etcd/client/srv.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/srv_test.go b/vendor/github.com/coreos/etcd/client/srv_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/srv_test.go
rename to vendor/github.com/coreos/etcd/client/srv_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path.go b/vendor/github.com/coreos/etcd/pkg/pathutil/path.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path.go
rename to vendor/github.com/coreos/etcd/pkg/pathutil/path.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path_test.go b/vendor/github.com/coreos/etcd/pkg/pathutil/path_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path_test.go
rename to vendor/github.com/coreos/etcd/pkg/pathutil/path_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener.go b/vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener_test.go b/vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener_test.go
rename to vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener.go b/vendor/github.com/coreos/etcd/pkg/transport/listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener_test.go b/vendor/github.com/coreos/etcd/pkg/transport/listener_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener_test.go
rename to vendor/github.com/coreos/etcd/pkg/transport/listener_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_conn.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_conn.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_conn.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer_test.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer_test.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener_test.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_listener_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener_test.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_listener_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_transport.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport_test.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_transport_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport_test.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_transport_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id.go b/vendor/github.com/coreos/etcd/pkg/types/id.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id.go
rename to vendor/github.com/coreos/etcd/pkg/types/id.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id_test.go b/vendor/github.com/coreos/etcd/pkg/types/id_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id_test.go
rename to vendor/github.com/coreos/etcd/pkg/types/id_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set.go b/vendor/github.com/coreos/etcd/pkg/types/set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set.go
rename to vendor/github.com/coreos/etcd/pkg/types/set.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set_test.go b/vendor/github.com/coreos/etcd/pkg/types/set_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set_test.go
rename to vendor/github.com/coreos/etcd/pkg/types/set_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice.go b/vendor/github.com/coreos/etcd/pkg/types/slice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice.go
rename to vendor/github.com/coreos/etcd/pkg/types/slice.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice_test.go b/vendor/github.com/coreos/etcd/pkg/types/slice_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice_test.go
rename to vendor/github.com/coreos/etcd/pkg/types/slice_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls.go b/vendor/github.com/coreos/etcd/pkg/types/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls.go
rename to vendor/github.com/coreos/etcd/pkg/types/urls.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls_test.go b/vendor/github.com/coreos/etcd/pkg/types/urls_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls_test.go
rename to vendor/github.com/coreos/etcd/pkg/types/urls_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap.go b/vendor/github.com/coreos/etcd/pkg/types/urlsmap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap.go
rename to vendor/github.com/coreos/etcd/pkg/types/urlsmap.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap_test.go b/vendor/github.com/coreos/etcd/pkg/types/urlsmap_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap_test.go
rename to vendor/github.com/coreos/etcd/pkg/types/urlsmap_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go b/vendor/github.com/coreos/go-iptables/iptables/iptables.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
rename to vendor/github.com/coreos/go-iptables/iptables/iptables.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables_test.go b/vendor/github.com/coreos/go-iptables/iptables/iptables_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables_test.go
rename to vendor/github.com/coreos/go-iptables/iptables/iptables_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go b/vendor/github.com/coreos/go-systemd/activation/files.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go
rename to vendor/github.com/coreos/go-systemd/activation/files.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files_test.go b/vendor/github.com/coreos/go-systemd/activation/files_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files_test.go
rename to vendor/github.com/coreos/go-systemd/activation/files_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go b/vendor/github.com/coreos/go-systemd/activation/listeners.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go
rename to vendor/github.com/coreos/go-systemd/activation/listeners.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners_test.go b/vendor/github.com/coreos/go-systemd/activation/listeners_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners_test.go
rename to vendor/github.com/coreos/go-systemd/activation/listeners_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go b/vendor/github.com/coreos/go-systemd/activation/packetconns.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go
rename to vendor/github.com/coreos/go-systemd/activation/packetconns.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns_test.go b/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns_test.go
rename to vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon/sdnotify.go b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/daemon/sdnotify.go
rename to vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env.go b/vendor/github.com/coreos/pkg/flagutil/env.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env.go
rename to vendor/github.com/coreos/pkg/flagutil/env.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env_test.go b/vendor/github.com/coreos/pkg/flagutil/env_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env_test.go
rename to vendor/github.com/coreos/pkg/flagutil/env_test.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types.go b/vendor/github.com/coreos/pkg/flagutil/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types.go
rename to vendor/github.com/coreos/pkg/flagutil/types.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types_test.go b/vendor/github.com/coreos/pkg/flagutil/types_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types_test.go
rename to vendor/github.com/coreos/pkg/flagutil/types_test.go
diff --git a/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/github.com/golang/glog/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/LICENSE
rename to vendor/github.com/golang/glog/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/glog/README b/vendor/github.com/golang/glog/README
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/README
rename to vendor/github.com/golang/glog/README
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/vendor/github.com/golang/glog/glog.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/glog.go
rename to vendor/github.com/golang/glog/glog.go
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go b/vendor/github.com/golang/glog/glog_file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/glog_file.go
rename to vendor/github.com/golang/glog/glog_file.go
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_test.go b/vendor/github.com/golang/glog/glog_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/glog_test.go
rename to vendor/github.com/golang/glog/glog_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml b/vendor/github.com/gorilla/context/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/.travis.yml
rename to vendor/github.com/gorilla/context/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/LICENSE
rename to vendor/github.com/gorilla/context/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/README.md
rename to vendor/github.com/gorilla/context/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/context.go
rename to vendor/github.com/gorilla/context/context.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context_test.go b/vendor/github.com/gorilla/context/context_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/context_test.go
rename to vendor/github.com/gorilla/context/context_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/doc.go
rename to vendor/github.com/gorilla/context/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml b/vendor/github.com/gorilla/mux/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
rename to vendor/github.com/gorilla/mux/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
rename to vendor/github.com/gorilla/mux/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/README.md b/vendor/github.com/gorilla/mux/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/README.md
rename to vendor/github.com/gorilla/mux/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go b/vendor/github.com/gorilla/mux/bench_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go
rename to vendor/github.com/gorilla/mux/bench_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/doc.go
rename to vendor/github.com/gorilla/mux/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/gorilla/mux/mux.go
rename to vendor/github.com/gorilla/mux/mux.go
index 8f3355c5ad..5b5f8e7db5 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
+++ b/vendor/github.com/gorilla/mux/mux.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"path"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/context"
+	"github.com/gorilla/context"
 )
 
 // NewRouter returns a new router instance.
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go b/vendor/github.com/gorilla/mux/mux_test.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
rename to vendor/github.com/gorilla/mux/mux_test.go
index 9a6e7b605b..e455bce8fd 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
+++ b/vendor/github.com/gorilla/mux/mux_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/context"
+	"github.com/gorilla/context"
 )
 
 type routeTest struct {
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/old_test.go b/vendor/github.com/gorilla/mux/old_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/old_test.go
rename to vendor/github.com/gorilla/mux/old_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
rename to vendor/github.com/gorilla/mux/regexp.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/route.go
rename to vendor/github.com/gorilla/mux/route.go
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore b/vendor/github.com/jonboulle/clockwork/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore
rename to vendor/github.com/jonboulle/clockwork/.gitignore
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml b/vendor/github.com/jonboulle/clockwork/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml
rename to vendor/github.com/jonboulle/clockwork/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE b/vendor/github.com/jonboulle/clockwork/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE
rename to vendor/github.com/jonboulle/clockwork/LICENSE
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md b/vendor/github.com/jonboulle/clockwork/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md
rename to vendor/github.com/jonboulle/clockwork/README.md
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go b/vendor/github.com/jonboulle/clockwork/clockwork.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go
rename to vendor/github.com/jonboulle/clockwork/clockwork.go
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork_test.go b/vendor/github.com/jonboulle/clockwork/clockwork_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork_test.go
rename to vendor/github.com/jonboulle/clockwork/clockwork_test.go
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/example_test.go b/vendor/github.com/jonboulle/clockwork/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/example_test.go
rename to vendor/github.com/jonboulle/clockwork/example_test.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE b/vendor/github.com/vaughan0/go-ini/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
rename to vendor/github.com/vaughan0/go-ini/LICENSE
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md b/vendor/github.com/vaughan0/go-ini/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
rename to vendor/github.com/vaughan0/go-ini/README.md
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go b/vendor/github.com/vaughan0/go-ini/ini.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
rename to vendor/github.com/vaughan0/go-ini/ini.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go b/vendor/github.com/vaughan0/go-ini/ini_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
rename to vendor/github.com/vaughan0/go-ini/ini_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go b/vendor/github.com/vaughan0/go-ini/ini_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
rename to vendor/github.com/vaughan0/go-ini/ini_test.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini b/vendor/github.com/vaughan0/go-ini/test.ini
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
rename to vendor/github.com/vaughan0/go-ini/test.ini
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml b/vendor/github.com/vishvananda/netlink/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml
rename to vendor/github.com/vishvananda/netlink/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/vishvananda/netlink/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
rename to vendor/github.com/vishvananda/netlink/LICENSE
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile b/vendor/github.com/vishvananda/netlink/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile
rename to vendor/github.com/vishvananda/netlink/Makefile
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md b/vendor/github.com/vishvananda/netlink/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/README.md
rename to vendor/github.com/vishvananda/netlink/README.md
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go b/vendor/github.com/vishvananda/netlink/addr.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go
rename to vendor/github.com/vishvananda/netlink/addr.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/vendor/github.com/vishvananda/netlink/addr_linux.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
rename to vendor/github.com/vishvananda/netlink/addr_linux.go
index 3abd280092..19aac0fb97 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
+++ b/vendor/github.com/vishvananda/netlink/addr_linux.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 // AddrAdd will add an IP address to a link device.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_test.go b/vendor/github.com/vishvananda/netlink/addr_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr_test.go
rename to vendor/github.com/vishvananda/netlink/addr_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/class.go b/vendor/github.com/vishvananda/netlink/class.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/class.go
rename to vendor/github.com/vishvananda/netlink/class.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go b/vendor/github.com/vishvananda/netlink/class_linux.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go
rename to vendor/github.com/vishvananda/netlink/class_linux.go
index 0811bd93c6..84828da101 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go
+++ b/vendor/github.com/vishvananda/netlink/class_linux.go
@@ -3,7 +3,7 @@ package netlink
 import (
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 // ClassDel will delete a class from the system.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/class_test.go b/vendor/github.com/vishvananda/netlink/class_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/class_test.go
rename to vendor/github.com/vishvananda/netlink/class_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go b/vendor/github.com/vishvananda/netlink/filter.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
rename to vendor/github.com/vishvananda/netlink/filter.go
index 56a6c65ed1..80ef34ded4 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
+++ b/vendor/github.com/vishvananda/netlink/filter.go
@@ -3,7 +3,7 @@ package netlink
 import (
 	"errors"
 	"fmt"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 type Filter interface {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go b/vendor/github.com/vishvananda/netlink/filter_linux.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
rename to vendor/github.com/vishvananda/netlink/filter_linux.go
index 2ee16cf516..1dc688b124 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
+++ b/vendor/github.com/vishvananda/netlink/filter_linux.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 // FilterDel will delete a filter from the system.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_test.go b/vendor/github.com/vishvananda/netlink/filter_test.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter_test.go
rename to vendor/github.com/vishvananda/netlink/filter_test.go
index f765413e4d..8353d25246 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_test.go
+++ b/vendor/github.com/vishvananda/netlink/filter_test.go
@@ -4,7 +4,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 func TestFilterAddDel(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go b/vendor/github.com/vishvananda/netlink/link.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
rename to vendor/github.com/vishvananda/netlink/link.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/vendor/github.com/vishvananda/netlink/link_linux.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
rename to vendor/github.com/vishvananda/netlink/link_linux.go
index 029f61cf28..08262857f1 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
+++ b/vendor/github.com/vishvananda/netlink/link_linux.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 var native = nl.NativeEndian()
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_test.go b/vendor/github.com/vishvananda/netlink/link_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link_test.go
rename to vendor/github.com/vishvananda/netlink/link_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_tuntap_linux.go b/vendor/github.com/vishvananda/netlink/link_tuntap_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link_tuntap_linux.go
rename to vendor/github.com/vishvananda/netlink/link_tuntap_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go b/vendor/github.com/vishvananda/netlink/neigh.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go
rename to vendor/github.com/vishvananda/netlink/neigh.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/vendor/github.com/vishvananda/netlink/neigh_linux.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
rename to vendor/github.com/vishvananda/netlink/neigh_linux.go
index 98545b8063..2af693bab9 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
+++ b/vendor/github.com/vishvananda/netlink/neigh_linux.go
@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_test.go b/vendor/github.com/vishvananda/netlink/neigh_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_test.go
rename to vendor/github.com/vishvananda/netlink/neigh_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/vendor/github.com/vishvananda/netlink/netlink.go
similarity index 93%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
rename to vendor/github.com/vishvananda/netlink/netlink.go
index d3c3c7a476..41ebdb11f1 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
+++ b/vendor/github.com/vishvananda/netlink/netlink.go
@@ -11,7 +11,7 @@ package netlink
 import (
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_test.go b/vendor/github.com/vishvananda/netlink/netlink_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_test.go
rename to vendor/github.com/vishvananda/netlink/netlink_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go b/vendor/github.com/vishvananda/netlink/netlink_unspecified.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go
rename to vendor/github.com/vishvananda/netlink/netlink_unspecified.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go b/vendor/github.com/vishvananda/netlink/nl/addr_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/addr_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/addr_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/addr_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go b/vendor/github.com/vishvananda/netlink/nl/link_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/link_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go b/vendor/github.com/vishvananda/netlink/nl/nl_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/nl_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/nl_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/nl_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go b/vendor/github.com/vishvananda/netlink/nl/route_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/route_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/route_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/route_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go b/vendor/github.com/vishvananda/netlink/nl/tc_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/tc_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/tc_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/tc_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux_test.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux_test.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go b/vendor/github.com/vishvananda/netlink/protinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go
rename to vendor/github.com/vishvananda/netlink/protinfo.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/vendor/github.com/vishvananda/netlink/protinfo_linux.go
similarity index 94%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
rename to vendor/github.com/vishvananda/netlink/protinfo_linux.go
index 3e0e92be20..7181eba100 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
+++ b/vendor/github.com/vishvananda/netlink/protinfo_linux.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 func LinkGetProtinfo(link Link) (Protinfo, error) {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_test.go b/vendor/github.com/vishvananda/netlink/protinfo_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_test.go
rename to vendor/github.com/vishvananda/netlink/protinfo_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go b/vendor/github.com/vishvananda/netlink/qdisc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go
rename to vendor/github.com/vishvananda/netlink/qdisc.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go b/vendor/github.com/vishvananda/netlink/qdisc_linux.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
rename to vendor/github.com/vishvananda/netlink/qdisc_linux.go
index 29b785c7a8..d9a8b170f5 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
+++ b/vendor/github.com/vishvananda/netlink/qdisc_linux.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 // QdiscDel will delete a qdisc from the system.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_test.go b/vendor/github.com/vishvananda/netlink/qdisc_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_test.go
rename to vendor/github.com/vishvananda/netlink/qdisc_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go b/vendor/github.com/vishvananda/netlink/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route.go
rename to vendor/github.com/vishvananda/netlink/route.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/vendor/github.com/vishvananda/netlink/route_linux.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
rename to vendor/github.com/vishvananda/netlink/route_linux.go
index ea88529341..c8910e2332 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
+++ b/vendor/github.com/vishvananda/netlink/route_linux.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 // RtAttr is shared so it is in netlink_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_test.go b/vendor/github.com/vishvananda/netlink/route_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route_test.go
rename to vendor/github.com/vishvananda/netlink/route_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go b/vendor/github.com/vishvananda/netlink/xfrm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go
rename to vendor/github.com/vishvananda/netlink/xfrm.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go b/vendor/github.com/vishvananda/netlink/xfrm_policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go
rename to vendor/github.com/vishvananda/netlink/xfrm_policy.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
rename to vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
index 6a4eabcdbb..2daf6dc8b3 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
+++ b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
@@ -3,7 +3,7 @@ package netlink
 import (
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_test.go b/vendor/github.com/vishvananda/netlink/xfrm_policy_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_test.go
rename to vendor/github.com/vishvananda/netlink/xfrm_policy_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go b/vendor/github.com/vishvananda/netlink/xfrm_state.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go
rename to vendor/github.com/vishvananda/netlink/xfrm_state.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
rename to vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
index 0d81d800cf..5f44ec8525 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
+++ b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	"github.com/vishvananda/netlink/nl"
 )
 
 func writeStateAlgo(a *XfrmStateAlgo) []byte {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_test.go b/vendor/github.com/vishvananda/netlink/xfrm_state_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_test.go
rename to vendor/github.com/vishvananda/netlink/xfrm_state_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/LICENSE b/vendor/github.com/vishvananda/netns/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/LICENSE
rename to vendor/github.com/vishvananda/netns/LICENSE
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/README.md b/vendor/github.com/vishvananda/netns/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/README.md
rename to vendor/github.com/vishvananda/netns/README.md
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux.go b/vendor/github.com/vishvananda/netns/netns_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux.go
rename to vendor/github.com/vishvananda/netns/netns_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_386.go b/vendor/github.com/vishvananda/netns/netns_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_386.go
rename to vendor/github.com/vishvananda/netns/netns_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_amd.go b/vendor/github.com/vishvananda/netns/netns_linux_amd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_amd.go
rename to vendor/github.com/vishvananda/netns/netns_linux_amd.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_arm.go b/vendor/github.com/vishvananda/netns/netns_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_linux_arm.go
rename to vendor/github.com/vishvananda/netns/netns_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_test.go b/vendor/github.com/vishvananda/netns/netns_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_test.go
rename to vendor/github.com/vishvananda/netns/netns_test.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netns/netns_unspecified.go b/vendor/github.com/vishvananda/netns/netns_unspecified.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netns/netns_unspecified.go
rename to vendor/github.com/vishvananda/netns/netns_unspecified.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/context.go
rename to vendor/golang.org/x/net/context/context.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context_test.go b/vendor/golang.org/x/net/context/context_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/context_test.go
rename to vendor/golang.org/x/net/context/context_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go b/vendor/golang.org/x/net/context/withtimeout_test.go
similarity index 89%
rename from Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
rename to vendor/golang.org/x/net/context/withtimeout_test.go
index 37fd34de5f..a6754dc368 100644
--- a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
+++ b/vendor/golang.org/x/net/context/withtimeout_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 )
 
 func ExampleWithTimeout() {