Fix import path `github.com/miekg/coredns` -> `github.com/coredns/coredns` (#547)

This fix fixes import path from
`github.com/miekg/coredns`
->
`github.com/coredns/coredns`

112 files changed, 258 insertions, 258 deletions

diff --git a/middleware/auto/auto.go b/middleware/auto/auto.go
index 0557fc3d1..019613a0f 100644
--- a/middleware/auto/auto.go
+++ b/middleware/auto/auto.go
@@ -6,11 +6,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/file"
-	"github.com/miekg/coredns/middleware/metrics"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/metrics"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/auto/setup.go b/middleware/auto/setup.go
index c08b5ee99..1f8fd3b6c 100644
--- a/middleware/auto/setup.go
+++ b/middleware/auto/setup.go
@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/file"
-	"github.com/miekg/coredns/middleware/metrics"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/middleware/proxy"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/metrics"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/proxy"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/auto/walk.go b/middleware/auto/walk.go
index faea1b74a..8b399f422 100644
--- a/middleware/auto/walk.go
+++ b/middleware/auto/walk.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/miekg/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/file"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/auto/zone.go b/middleware/auto/zone.go
index f825871f7..ead26541e 100644
--- a/middleware/auto/zone.go
+++ b/middleware/auto/zone.go
@@ -4,7 +4,7 @@ package auto
 import (
 	"sync"
 
-	"github.com/miekg/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/file"
 )
 
 // Zones maps zone names to a *Zone. This keep track of what we zones we have loaded at
diff --git a/middleware/backend.go b/middleware/backend.go
index 12d1187dc..e1c6e9496 100644
--- a/middleware/backend.go
+++ b/middleware/backend.go
@@ -1,8 +1,8 @@
 package middleware
 
 import (
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/backend_lookup.go b/middleware/backend_lookup.go
index b9de97d67..8b86495bb 100644
--- a/middleware/backend_lookup.go
+++ b/middleware/backend_lookup.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/bind/bind_test.go b/middleware/bind/bind_test.go
index d61741a02..11556f0bd 100644
--- a/middleware/bind/bind_test.go
+++ b/middleware/bind/bind_test.go
@@ -3,7 +3,7 @@ package bind
 import (
 	"testing"
 
-	"github.com/miekg/coredns/core/dnsserver"
+	"github.com/coredns/coredns/core/dnsserver"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/bind/setup.go b/middleware/bind/setup.go
index 1c40e8fda..1e7178cc3 100644
--- a/middleware/bind/setup.go
+++ b/middleware/bind/setup.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/cache/cache.go b/middleware/cache/cache.go
index 2cd897145..1bd3d3352 100644
--- a/middleware/cache/cache.go
+++ b/middleware/cache/cache.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/miekg/dns"
diff --git a/middleware/cache/cache_test.go b/middleware/cache/cache_test.go
index 31aeaa8ac..d703e2a58 100644
--- a/middleware/cache/cache_test.go
+++ b/middleware/cache/cache_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/response"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/test"
 
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/miekg/dns"
diff --git a/middleware/cache/handler.go b/middleware/cache/handler.go
index b55904469..195322e31 100644
--- a/middleware/cache/handler.go
+++ b/middleware/cache/handler.go
@@ -3,8 +3,8 @@ package cache
 import (
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/middleware/cache/item.go b/middleware/cache/item.go
index 37c4f048a..6a75afdf9 100644
--- a/middleware/cache/item.go
+++ b/middleware/cache/item.go
@@ -3,7 +3,7 @@ package cache
 import (
 	"time"
 
-	"github.com/miekg/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/pkg/response"
 	"github.com/miekg/dns"
 )
 
diff --git a/middleware/cache/setup.go b/middleware/cache/setup.go
index 337930fe4..eb835ba4e 100644
--- a/middleware/cache/setup.go
+++ b/middleware/cache/setup.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/mholt/caddy"
diff --git a/middleware/chaos/chaos.go b/middleware/chaos/chaos.go
index cad9e0445..e320a1b7a 100644
--- a/middleware/chaos/chaos.go
+++ b/middleware/chaos/chaos.go
@@ -4,8 +4,8 @@ package chaos
 import (
 	"os"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/chaos/chaos_test.go b/middleware/chaos/chaos_test.go
index 333083187..dd383370b 100644
--- a/middleware/chaos/chaos_test.go
+++ b/middleware/chaos/chaos_test.go
@@ -3,9 +3,9 @@ package chaos
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/chaos/setup.go b/middleware/chaos/setup.go
index 124c7d533..816dc7944 100644
--- a/middleware/chaos/setup.go
+++ b/middleware/chaos/setup.go
@@ -1,8 +1,8 @@
 package chaos
 
 import (
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/dnssec/black_lies_test.go b/middleware/dnssec/black_lies_test.go
index 55af75302..342e7bb3a 100644
--- a/middleware/dnssec/black_lies_test.go
+++ b/middleware/dnssec/black_lies_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/test"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/dnssec/cache_test.go b/middleware/dnssec/cache_test.go
index a3b7b818d..c88e310e3 100644
--- a/middleware/dnssec/cache_test.go
+++ b/middleware/dnssec/cache_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/test"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
 
 	"github.com/hashicorp/golang-lru"
 )
diff --git a/middleware/dnssec/dnskey.go b/middleware/dnssec/dnskey.go
index df19571c8..ce787ab54 100644
--- a/middleware/dnssec/dnskey.go
+++ b/middleware/dnssec/dnskey.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/dnssec/dnssec.go b/middleware/dnssec/dnssec.go
index e2c37e6ca..539ef0b98 100644
--- a/middleware/dnssec/dnssec.go
+++ b/middleware/dnssec/dnssec.go
@@ -5,10 +5,10 @@ package dnssec
 import (
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/response"
-	"github.com/miekg/coredns/middleware/pkg/singleflight"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/request"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/miekg/dns"
diff --git a/middleware/dnssec/dnssec_test.go b/middleware/dnssec/dnssec_test.go
index d8f20bc00..037dfbdd7 100644
--- a/middleware/dnssec/dnssec_test.go
+++ b/middleware/dnssec/dnssec_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/test"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/miekg/dns"
diff --git a/middleware/dnssec/handler.go b/middleware/dnssec/handler.go
index 9a45b88b2..dab02e469 100644
--- a/middleware/dnssec/handler.go
+++ b/middleware/dnssec/handler.go
@@ -1,8 +1,8 @@
 package dnssec
 
 import (
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/middleware/dnssec/handler_test.go b/middleware/dnssec/handler_test.go
index e8ca68c6f..0264950c9 100644
--- a/middleware/dnssec/handler_test.go
+++ b/middleware/dnssec/handler_test.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/file"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/miekg/dns"
diff --git a/middleware/dnssec/responsewriter.go b/middleware/dnssec/responsewriter.go
index e7af62a9e..d3c34d114 100644
--- a/middleware/dnssec/responsewriter.go
+++ b/middleware/dnssec/responsewriter.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/dnssec/setup.go b/middleware/dnssec/setup.go
index 639303ea9..1b1fb6393 100644
--- a/middleware/dnssec/setup.go
+++ b/middleware/dnssec/setup.go
@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/hashicorp/golang-lru"
 	"github.com/mholt/caddy"
diff --git a/middleware/erratic/erratic.go b/middleware/erratic/erratic.go
index 065ed361b..3aec36798 100644
--- a/middleware/erratic/erratic.go
+++ b/middleware/erratic/erratic.go
@@ -4,7 +4,7 @@ package erratic
 import (
 	"sync/atomic"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/erratic/erratic_test.go b/middleware/erratic/erratic_test.go
index eaf34c39b..e63545b35 100644
--- a/middleware/erratic/erratic_test.go
+++ b/middleware/erratic/erratic_test.go
@@ -3,8 +3,8 @@ package erratic
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/erratic/setup.go b/middleware/erratic/setup.go
index 207db317b..ac40d24fb 100644
--- a/middleware/erratic/setup.go
+++ b/middleware/erratic/setup.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go
index deba2075d..d2b6f3a22 100644
--- a/middleware/errors/errors.go
+++ b/middleware/errors/errors.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/errors/errors_test.go b/middleware/errors/errors_test.go
index 1bf81444b..1d389ba47 100644
--- a/middleware/errors/errors_test.go
+++ b/middleware/errors/errors_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/errors/setup.go b/middleware/errors/setup.go
index f15141919..787b89724 100644
--- a/middleware/errors/setup.go
+++ b/middleware/errors/setup.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/hashicorp/go-syslog"
 	"github.com/mholt/caddy"
diff --git a/middleware/etcd/cname_test.go b/middleware/etcd/cname_test.go
index fdd0f50e5..4c39491fd 100644
--- a/middleware/etcd/cname_test.go
+++ b/middleware/etcd/cname_test.go
@@ -7,9 +7,9 @@ package etcd
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/debug_test.go b/middleware/etcd/debug_test.go
index 7ea91ecbe..65e503d6a 100644
--- a/middleware/etcd/debug_test.go
+++ b/middleware/etcd/debug_test.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/etcd.go b/middleware/etcd/etcd.go
index f2f53895f..f701785f3 100644
--- a/middleware/etcd/etcd.go
+++ b/middleware/etcd/etcd.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/singleflight"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
 
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"
diff --git a/middleware/etcd/group_test.go b/middleware/etcd/group_test.go
index abf777982..0c18587ca 100644
--- a/middleware/etcd/group_test.go
+++ b/middleware/etcd/group_test.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/handler.go b/middleware/etcd/handler.go
index 331e57793..ac5f11772 100644
--- a/middleware/etcd/handler.go
+++ b/middleware/etcd/handler.go
@@ -3,11 +3,11 @@ package etcd
 import (
 	"errors"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/debug"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/debug"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/etcd/lookup_test.go b/middleware/etcd/lookup_test.go
index 14b9d0c98..dc61a6e73 100644
--- a/middleware/etcd/lookup_test.go
+++ b/middleware/etcd/lookup_test.go
@@ -3,8 +3,8 @@
 package etcd
 
 import (
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/multi_test.go b/middleware/etcd/multi_test.go
index d4e3493a7..26ce9b3ce 100644
--- a/middleware/etcd/multi_test.go
+++ b/middleware/etcd/multi_test.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/other_test.go b/middleware/etcd/other_test.go
index 2ed622fe0..22b720078 100644
--- a/middleware/etcd/other_test.go
+++ b/middleware/etcd/other_test.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/proxy_lookup_test.go b/middleware/etcd/proxy_lookup_test.go
index 0404da04b..3ee3005d7 100644
--- a/middleware/etcd/proxy_lookup_test.go
+++ b/middleware/etcd/proxy_lookup_test.go
@@ -6,10 +6,10 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/setup.go b/middleware/etcd/setup.go
index 065b3e884..a6dca57c0 100644
--- a/middleware/etcd/setup.go
+++ b/middleware/etcd/setup.go
@@ -6,12 +6,12 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/middleware/pkg/singleflight"
-	mwtls "github.com/miekg/coredns/middleware/pkg/tls"
-	"github.com/miekg/coredns/middleware/proxy"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	mwtls "github.com/coredns/coredns/middleware/pkg/tls"
+	"github.com/coredns/coredns/middleware/proxy"
 
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/mholt/caddy"
diff --git a/middleware/etcd/setup_test.go b/middleware/etcd/setup_test.go
index 90b645eb0..d29f34bc5 100644
--- a/middleware/etcd/setup_test.go
+++ b/middleware/etcd/setup_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/pkg/singleflight"
-	"github.com/miekg/coredns/middleware/pkg/tls"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/middleware/pkg/tls"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
 
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/mholt/caddy"
diff --git a/middleware/etcd/stub.go b/middleware/etcd/stub.go
index 8c1924b57..ae75a88d1 100644
--- a/middleware/etcd/stub.go
+++ b/middleware/etcd/stub.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/proxy"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/etcd/stub_handler.go b/middleware/etcd/stub_handler.go
index b5120041a..a6b752177 100644
--- a/middleware/etcd/stub_handler.go
+++ b/middleware/etcd/stub_handler.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"log"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/etcd/stub_test.go b/middleware/etcd/stub_test.go
index c1ba5ee5c..2ec89c0bf 100644
--- a/middleware/etcd/stub_test.go
+++ b/middleware/etcd/stub_test.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/closest.go b/middleware/file/closest.go
index 172242669..ea201671f 100644
--- a/middleware/file/closest.go
+++ b/middleware/file/closest.go
@@ -1,7 +1,7 @@
 package file
 
 import (
-	"github.com/miekg/coredns/middleware/file/tree"
+	"github.com/coredns/coredns/middleware/file/tree"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/cname_test.go b/middleware/file/cname_test.go
index 1b1e4dfd3..3961d09e4 100644
--- a/middleware/file/cname_test.go
+++ b/middleware/file/cname_test.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/delegation_test.go b/middleware/file/delegation_test.go
index 9b72e7033..07fb814a5 100644
--- a/middleware/file/delegation_test.go
+++ b/middleware/file/delegation_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/dnssec_test.go b/middleware/file/dnssec_test.go
index ebce6fd78..e033da051 100644
--- a/middleware/file/dnssec_test.go
+++ b/middleware/file/dnssec_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/ds_test.go b/middleware/file/ds_test.go
index b89c0e15c..691b6ddb4 100644
--- a/middleware/file/ds_test.go
+++ b/middleware/file/ds_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/ent_test.go b/middleware/file/ent_test.go
index 4ce1403bf..119e02893 100644
--- a/middleware/file/ent_test.go
+++ b/middleware/file/ent_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/file.go b/middleware/file/file.go
index 13ef894d3..b07ec9cfd 100644
--- a/middleware/file/file.go
+++ b/middleware/file/file.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"log"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/glue_test.go b/middleware/file/glue_test.go
index 0eb45cc33..289c30428 100644
--- a/middleware/file/glue_test.go
+++ b/middleware/file/glue_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/lookup.go b/middleware/file/lookup.go
index e4e7e0579..94ec0e726 100644
--- a/middleware/file/lookup.go
+++ b/middleware/file/lookup.go
@@ -1,8 +1,8 @@
 package file
 
 import (
-	"github.com/miekg/coredns/middleware/file/tree"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/file/tree"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/lookup_test.go b/middleware/file/lookup_test.go
index a85cb2863..51c057ffd 100644
--- a/middleware/file/lookup_test.go
+++ b/middleware/file/lookup_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/notify.go b/middleware/file/notify.go
index c838512fe..381c1e8c2 100644
--- a/middleware/file/notify.go
+++ b/middleware/file/notify.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/rcode"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/reload_test.go b/middleware/file/reload_test.go
index caa81b536..77e644417 100644
--- a/middleware/file/reload_test.go
+++ b/middleware/file/reload_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/test"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/secondary_test.go b/middleware/file/secondary_test.go
index e978fcd2f..cdb051d26 100644
--- a/middleware/file/secondary_test.go
+++ b/middleware/file/secondary_test.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/test"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/file/setup.go b/middleware/file/setup.go
index 2da238ff4..c48e4c089 100644
--- a/middleware/file/setup.go
+++ b/middleware/file/setup.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"path"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/middleware/proxy"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/proxy"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/file/setup_test.go b/middleware/file/setup_test.go
index 9fd9e3587..02ed049c4 100644
--- a/middleware/file/setup_test.go
+++ b/middleware/file/setup_test.go
@@ -3,7 +3,7 @@ package file
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/file/wildcard_test.go b/middleware/file/wildcard_test.go
index a4313fe8f..9f34b13f2 100644
--- a/middleware/file/wildcard_test.go
+++ b/middleware/file/wildcard_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/xfr.go b/middleware/file/xfr.go
index 3cb21aa11..4d7f07a48 100644
--- a/middleware/file/xfr.go
+++ b/middleware/file/xfr.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/file/zone.go b/middleware/file/zone.go
index 0c0df1a1f..2d994319a 100644
--- a/middleware/file/zone.go
+++ b/middleware/file/zone.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/miekg/coredns/middleware/file/tree"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/file/tree"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/miekg/dns"
diff --git a/middleware/health/setup.go b/middleware/health/setup.go
index a396d2902..f698d9603 100644
--- a/middleware/health/setup.go
+++ b/middleware/health/setup.go
@@ -1,7 +1,7 @@
 package health
 
 import (
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go
index 326e3ac13..dd2a8a7a1 100644
--- a/middleware/kubernetes/handler.go
+++ b/middleware/kubernetes/handler.go
@@ -3,9 +3,9 @@ package kubernetes
 import (
 	"errors"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index f5d3d55be..4b95c82e8 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	dnsstrings "github.com/miekg/coredns/middleware/pkg/strings"
-	"github.com/miekg/coredns/middleware/proxy"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	dnsstrings "github.com/coredns/coredns/middleware/pkg/strings"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"k8s.io/client-go/1.5/kubernetes"
diff --git a/middleware/kubernetes/lookup.go b/middleware/kubernetes/lookup.go
index a3c9fcbc0..57659012d 100644
--- a/middleware/kubernetes/lookup.go
+++ b/middleware/kubernetes/lookup.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/miekg/coredns/middleware/etcd/msg"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/kubernetes/setup.go b/middleware/kubernetes/setup.go
index bd3ad761b..f853db8ce 100644
--- a/middleware/kubernetes/setup.go
+++ b/middleware/kubernetes/setup.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 	unversionedapi "k8s.io/client-go/1.5/pkg/api/unversioned"
diff --git a/middleware/loadbalance/handler.go b/middleware/loadbalance/handler.go
index 9b4baf2ed..3d3e4aa26 100644
--- a/middleware/loadbalance/handler.go
+++ b/middleware/loadbalance/handler.go
@@ -2,7 +2,7 @@
 package loadbalance
 
 import (
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/loadbalance/loadbalance_test.go b/middleware/loadbalance/loadbalance_test.go
index 983186a1c..8c9205ca9 100644
--- a/middleware/loadbalance/loadbalance_test.go
+++ b/middleware/loadbalance/loadbalance_test.go
@@ -3,9 +3,9 @@ package loadbalance
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/loadbalance/setup.go b/middleware/loadbalance/setup.go
index 9f6e030d8..95590adbe 100644
--- a/middleware/loadbalance/setup.go
+++ b/middleware/loadbalance/setup.go
@@ -2,8 +2,8 @@ package loadbalance
 
 import (
 	"github.com/mholt/caddy"
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 )
 
 func init() {
diff --git a/middleware/log/log.go b/middleware/log/log.go
index 1ba594d0f..137411f27 100644
--- a/middleware/log/log.go
+++ b/middleware/log/log.go
@@ -5,13 +5,13 @@ import (
 	"log"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/metrics/vars"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/pkg/rcode"
-	"github.com/miekg/coredns/middleware/pkg/replacer"
-	"github.com/miekg/coredns/middleware/pkg/response"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/middleware/pkg/replacer"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/log/log_test.go b/middleware/log/log_test.go
index 8e6d48418..80efc971c 100644
--- a/middleware/log/log_test.go
+++ b/middleware/log/log_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/pkg/response"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/log/setup.go b/middleware/log/setup.go
index 3354da9d8..ce4f5c44d 100644
--- a/middleware/log/setup.go
+++ b/middleware/log/setup.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
 
 	"github.com/hashicorp/go-syslog"
 	"github.com/mholt/caddy"
diff --git a/middleware/log/setup_test.go b/middleware/log/setup_test.go
index 8ae4fa03b..48bfbfa04 100644
--- a/middleware/log/setup_test.go
+++ b/middleware/log/setup_test.go
@@ -3,7 +3,7 @@ package log
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/pkg/response"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/metrics/handler.go b/middleware/metrics/handler.go
index 8b8f4d419..50dc4141e 100644
--- a/middleware/metrics/handler.go
+++ b/middleware/metrics/handler.go
@@ -1,11 +1,11 @@
 package metrics
 
 import (
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/metrics/vars"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/pkg/rcode"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/metrics/metrics.go b/middleware/metrics/metrics.go
index 8709f3fe4..6e06a2bf4 100644
--- a/middleware/metrics/metrics.go
+++ b/middleware/metrics/metrics.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/middleware/metrics/metrics_test.go b/middleware/metrics/metrics_test.go
index f93021fa5..18a9011ed 100644
--- a/middleware/metrics/metrics_test.go
+++ b/middleware/metrics/metrics_test.go
@@ -3,10 +3,10 @@ package metrics
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware"
-	mtest "github.com/miekg/coredns/middleware/metrics/test"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	mtest "github.com/coredns/coredns/middleware/metrics/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/metrics/setup.go b/middleware/metrics/setup.go
index 1af41222e..40f0ee671 100644
--- a/middleware/metrics/setup.go
+++ b/middleware/metrics/setup.go
@@ -4,8 +4,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/metrics/vars/report.go b/middleware/metrics/vars/report.go
index 0c9945440..5d8f2ba64 100644
--- a/middleware/metrics/vars/report.go
+++ b/middleware/metrics/vars/report.go
@@ -3,7 +3,7 @@ package vars
 import (
 	"time"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/metrics/vars/vars.go b/middleware/metrics/vars/vars.go
index 7c7576077..42af10007 100644
--- a/middleware/metrics/vars/vars.go
+++ b/middleware/metrics/vars/vars.go
@@ -1,7 +1,7 @@
 package vars
 
 import (
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/middleware/pkg/replacer/replacer.go b/middleware/pkg/replacer/replacer.go
index 890f0c45f..5227808ae 100644
--- a/middleware/pkg/replacer/replacer.go
+++ b/middleware/pkg/replacer/replacer.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/pkg/response/typify_test.go b/middleware/pkg/response/typify_test.go
index ff07f59fc..3ae795e23 100644
--- a/middleware/pkg/response/typify_test.go
+++ b/middleware/pkg/response/typify_test.go
@@ -3,7 +3,7 @@ package response
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/pkg/tls/tls_test.go b/middleware/pkg/tls/tls_test.go
index b6ef220b7..6d0cb7372 100644
--- a/middleware/pkg/tls/tls_test.go
+++ b/middleware/pkg/tls/tls_test.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/test"
 )
 
 func getPEMFiles(t *testing.T) (rmFunc func(), cert, key, ca string) {
diff --git a/middleware/pprof/setup.go b/middleware/pprof/setup.go
index 8dc621da9..37359ed8f 100644
--- a/middleware/pprof/setup.go
+++ b/middleware/pprof/setup.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/mholt/caddy"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 )
 
 func init() {
diff --git a/middleware/proxy/README.md b/middleware/proxy/README.md
index dcde47b00..4a69e999e 100644
--- a/middleware/proxy/README.md
+++ b/middleware/proxy/README.md
@@ -51,7 +51,7 @@ proxy FROM TO... {
 * `protocol` specifies what protocol to use to speak to an upstream, `dns` (the default) is plain
   old DNS, and `https_google` uses `https://dns.google.com` and speaks a JSON DNS dialect. Note when
   using this **TO** will be ignored. The `grpc` option will talk to a server that has implemented
-  the [DnsService](https://github.com/miekg/coredns/middleware/proxy/pb/dns.proto).
+  the [DnsService](https://github.com/coredns/coredns/middleware/proxy/pb/dns.proto).
   An out-of-tree middleware that implements the server side of this can be found at
   [here](https://github.com/infobloxopen/coredns-grpc).
 
diff --git a/middleware/proxy/dns.go b/middleware/proxy/dns.go
index 45d8e3e2e..3e212c7c3 100644
--- a/middleware/proxy/dns.go
+++ b/middleware/proxy/dns.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/miekg/coredns/middleware/pkg/singleflight"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/proxy/exchanger.go b/middleware/proxy/exchanger.go
index d5c17e349..28e1b1b11 100644
--- a/middleware/proxy/exchanger.go
+++ b/middleware/proxy/exchanger.go
@@ -3,7 +3,7 @@ package proxy
 import (
 	"context"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 	"github.com/miekg/dns"
 )
 
diff --git a/middleware/proxy/google.go b/middleware/proxy/google.go
index 4d82ec914..dc83755ad 100644
--- a/middleware/proxy/google.go
+++ b/middleware/proxy/google.go
@@ -13,8 +13,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/miekg/coredns/middleware/pkg/debug"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/pkg/debug"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/proxy/grpc.go b/middleware/proxy/grpc.go
index 4087362ae..aaf908d2a 100644
--- a/middleware/proxy/grpc.go
+++ b/middleware/proxy/grpc.go
@@ -5,8 +5,8 @@ import (
 	"crypto/tls"
 	"log"
 
-	"github.com/miekg/coredns/middleware/proxy/pb"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware/proxy/pb"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"google.golang.org/grpc"
diff --git a/middleware/proxy/lookup.go b/middleware/proxy/lookup.go
index 9c736aa63..af94f25e2 100644
--- a/middleware/proxy/lookup.go
+++ b/middleware/proxy/lookup.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/proxy/metrics.go b/middleware/proxy/metrics.go
index 1b238148b..e9bb48d6f 100644
--- a/middleware/proxy/metrics.go
+++ b/middleware/proxy/metrics.go
@@ -3,7 +3,7 @@ package proxy
 import (
 	"sync"
 
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/middleware/proxy/proxy.go b/middleware/proxy/proxy.go
index ca57d7575..090c070cb 100644
--- a/middleware/proxy/proxy.go
+++ b/middleware/proxy/proxy.go
@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
diff --git a/middleware/proxy/setup.go b/middleware/proxy/setup.go
index 538ecb67a..3e4f262b7 100644
--- a/middleware/proxy/setup.go
+++ b/middleware/proxy/setup.go
@@ -1,8 +1,8 @@
 package proxy
 
 import (
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/proxy/upstream.go b/middleware/proxy/upstream.go
index 94475503c..fdc04cbc4 100644
--- a/middleware/proxy/upstream.go
+++ b/middleware/proxy/upstream.go
@@ -11,9 +11,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/middleware/pkg/tls"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/pkg/tls"
 
 	"github.com/mholt/caddy/caddyfile"
 	"github.com/miekg/dns"
diff --git a/middleware/proxy/upstream_test.go b/middleware/proxy/upstream_test.go
index 81b8c1838..fc38f1fae 100644
--- a/middleware/proxy/upstream_test.go
+++ b/middleware/proxy/upstream_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/reverse/reverse.go b/middleware/reverse/reverse.go
index 44d28ddc3..eb14ae155 100644
--- a/middleware/reverse/reverse.go
+++ b/middleware/reverse/reverse.go
@@ -3,9 +3,9 @@ package reverse
 import (
 	"net"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsutil"
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/reverse/setup.go b/middleware/reverse/setup.go
index e9f6c78b4..ea94aea7d 100644
--- a/middleware/reverse/setup.go
+++ b/middleware/reverse/setup.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/rewrite/condition.go b/middleware/rewrite/condition.go
index e9c565abc..5bc8452a9 100644
--- a/middleware/rewrite/condition.go
+++ b/middleware/rewrite/condition.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/miekg/coredns/middleware/pkg/replacer"
+	"github.com/coredns/coredns/middleware/pkg/replacer"
 
 	"github.com/miekg/dns"
 )
diff --git a/middleware/rewrite/name.go b/middleware/rewrite/name.go
index 645e1dc04..895c80070 100644
--- a/middleware/rewrite/name.go
+++ b/middleware/rewrite/name.go
@@ -4,7 +4,7 @@ package rewrite
 import (
 	"strings"
 
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 	"github.com/miekg/dns"
 )
 
diff --git a/middleware/rewrite/rewrite.go b/middleware/rewrite/rewrite.go
index cb5bbc288..24e57005e 100644
--- a/middleware/rewrite/rewrite.go
+++ b/middleware/rewrite/rewrite.go
@@ -2,7 +2,7 @@
 package rewrite
 
 import (
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
 )
diff --git a/middleware/rewrite/rewrite_test.go b/middleware/rewrite/rewrite_test.go
index c9753635c..64d0d5eec 100644
--- a/middleware/rewrite/rewrite_test.go
+++ b/middleware/rewrite/rewrite_test.go
@@ -3,9 +3,9 @@ package rewrite
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/rewrite/setup.go b/middleware/rewrite/setup.go
index 81fbacfb9..9befa30a1 100644
--- a/middleware/rewrite/setup.go
+++ b/middleware/rewrite/setup.go
@@ -3,8 +3,8 @@ package rewrite
 import (
 	"log"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/root/root.go b/middleware/root/root.go
index 6a7f9fe9f..6a26fbd1a 100644
--- a/middleware/root/root.go
+++ b/middleware/root/root.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/miekg/coredns/core/dnsserver"
+	"github.com/coredns/coredns/core/dnsserver"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/root/root_test.go b/middleware/root/root_test.go
index 434c82dfd..0a58c69bf 100644
--- a/middleware/root/root_test.go
+++ b/middleware/root/root_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/miekg/coredns/core/dnsserver"
+	"github.com/coredns/coredns/core/dnsserver"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/secondary/secondary.go b/middleware/secondary/secondary.go
index 6a95230f4..da31d5171 100644
--- a/middleware/secondary/secondary.go
+++ b/middleware/secondary/secondary.go
@@ -1,7 +1,7 @@
 // Package secondary implements a secondary middleware.
 package secondary
 
-import "github.com/miekg/coredns/middleware/file"
+import "github.com/coredns/coredns/middleware/file"
 
 // Secondary implements a secondary middleware that allows CoreDNS to retrieve (via AXFR)
 // zone information from a primary server.
diff --git a/middleware/secondary/setup.go b/middleware/secondary/setup.go
index d239053ff..5822f9e8f 100644
--- a/middleware/secondary/setup.go
+++ b/middleware/secondary/setup.go
@@ -1,9 +1,9 @@
 package secondary
 
 import (
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/file"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/trace/setup.go b/middleware/trace/setup.go
index 57531d34c..0c5350c09 100644
--- a/middleware/trace/setup.go
+++ b/middleware/trace/setup.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/trace/trace.go b/middleware/trace/trace.go
index b7ce3c27c..00c476d76 100644
--- a/middleware/trace/trace.go
+++ b/middleware/trace/trace.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/middleware"
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 	zipkin "github.com/openzipkin/zipkin-go-opentracing"
diff --git a/middleware/whoami/setup.go b/middleware/whoami/setup.go
index 90e5dd4ae..e11ac6567 100644
--- a/middleware/whoami/setup.go
+++ b/middleware/whoami/setup.go
@@ -1,8 +1,8 @@
 package whoami
 
 import (
-	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
 
 	"github.com/mholt/caddy"
 )
diff --git a/middleware/whoami/whoami.go b/middleware/whoami/whoami.go
index 01af7107f..6b5ed332a 100644
--- a/middleware/whoami/whoami.go
+++ b/middleware/whoami/whoami.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/miekg/coredns/request"
+	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
diff --git a/middleware/whoami/whoami_test.go b/middleware/whoami/whoami_test.go
index 736cdf18a..d9357e497 100644
--- a/middleware/whoami/whoami_test.go
+++ b/middleware/whoami/whoami_test.go
@@ -3,8 +3,8 @@ package whoami
 import (
 	"testing"
 
-	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
-	"github.com/miekg/coredns/middleware/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"