diff --git a/README.md b/README.md
index 24b3aef2..0d7b85bb 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Yay open source! Please see our [contributing guidelines](https://tendermint.com
 * [ABCI](http://github.com/tendermint/abci)
 * [Mintnet](http://github.com/tendermint/mintnet)
 * [Go-Wire](http://github.com/tendermint/go-wire)
-* [Go-P2P](http://github.com/tendermint/go-p2p)
+* [Go-P2P](http://github.com/tendermint/tendermint/p2p)
 * [Go-Merkle](http://github.com/tendermint/go-merkle)
 
 ### Applications
diff --git a/benchmarks/codec_test.go b/benchmarks/codec_test.go
index 218b3fd0..205aec40 100644
--- a/benchmarks/codec_test.go
+++ b/benchmarks/codec_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/tendermint/go-crypto"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/go-wire"
 	proto "github.com/tendermint/tendermint/benchmarks/proto"
 	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index 122f03ae..a788c4ac 100644
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -8,7 +8,7 @@ import (
 
 	cmn "github.com/tendermint/tmlibs/common"
 	cfg "github.com/tendermint/go-config"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/go-wire"
 	"github.com/tendermint/tendermint/proxy"
 	sm "github.com/tendermint/tendermint/state"
diff --git a/cmd/tendermint/commands/probe_upnp.go b/cmd/tendermint/commands/probe_upnp.go
index bff433bc..eb55d669 100644
--- a/cmd/tendermint/commands/probe_upnp.go
+++ b/cmd/tendermint/commands/probe_upnp.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/go-p2p/upnp"
+	"github.com/tendermint/tendermint/p2p/upnp"
 )
 
 var probeUpnpCmd = &cobra.Command{
diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go
index fabf4e3c..acd9e90e 100644
--- a/consensus/byzantine_test.go
+++ b/consensus/byzantine_test.go
@@ -10,7 +10,7 @@ import (
 	. "github.com/tendermint/tmlibs/common"
 	cfg "github.com/tendermint/go-config"
 	"github.com/tendermint/tmlibs/events"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/consensus/common_test.go b/consensus/common_test.go
index 6effddb2..77cc8172 100644
--- a/consensus/common_test.go
+++ b/consensus/common_test.go
@@ -16,7 +16,7 @@ import (
 	. "github.com/tendermint/tmlibs/common"
 	cfg "github.com/tendermint/go-config"
 	dbm "github.com/tendermint/tmlibs/db"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	bc "github.com/tendermint/tendermint/blockchain"
 	"github.com/tendermint/tendermint/config/tendermint_test"
 	mempl "github.com/tendermint/tendermint/mempool"
diff --git a/consensus/reactor.go b/consensus/reactor.go
index cd0c069f..5fe45cc0 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/go-wire"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go
index 1ebbf8a5..66827c15 100644
--- a/consensus/reactor_test.go
+++ b/consensus/reactor_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tendermint/tendermint/config/tendermint_test"
 
 	"github.com/tendermint/tmlibs/events"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/types"
 	"github.com/tendermint/abci/example/dummy"
 )
diff --git a/glide.lock b/glide.lock
index c7c4649e..b83a0514 100644
--- a/glide.lock
+++ b/glide.lock
@@ -104,7 +104,7 @@ imports:
   version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
 - name: github.com/tendermint/go-merkle
   version: 714d4d04557fd068a7c2a1748241ce8428015a96
-- name: github.com/tendermint/go-p2p
+- name: github.com/tendermint/tendermint/p2p
   version: b5f314ffed65c81bd019ba1dd2bae0e95f3937f3
   subpackages:
   - upnp
diff --git a/glide.yaml b/glide.yaml
index a1013eb9..b7e24b54 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   version: develop
 - package: github.com/tendermint/go-merkle
   version: develop
-- package: github.com/tendermint/go-p2p
+- package: github.com/tendermint/tendermint/p2p
   version: unstable
 - package: github.com/tendermint/tendermint/rpc
   version: develop
diff --git a/mempool/reactor.go b/mempool/reactor.go
index 4b30dd4c..4d163888 100644
--- a/mempool/reactor.go
+++ b/mempool/reactor.go
@@ -9,7 +9,7 @@ import (
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/tmlibs/clist"
 	cfg "github.com/tendermint/go-config"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/go-wire"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/node/node.go b/node/node.go
index e912495f..f24c1c4f 100644
--- a/node/node.go
+++ b/node/node.go
@@ -12,7 +12,7 @@ import (
 	cfg "github.com/tendermint/go-config"
 	crypto "github.com/tendermint/go-crypto"
 	dbm "github.com/tendermint/tmlibs/db"
-	p2p "github.com/tendermint/go-p2p"
+	p2p "github.com/tendermint/tendermint/p2p"
 	rpc "github.com/tendermint/tendermint/rpc"
 	rpcserver "github.com/tendermint/tendermint/rpc/server"
 	wire "github.com/tendermint/go-wire"
diff --git a/p2p/Dockerfile b/p2p/Dockerfile
index 3716185f..6c71b2f8 100644
--- a/p2p/Dockerfile
+++ b/p2p/Dockerfile
@@ -2,12 +2,12 @@ FROM golang:latest
 
 RUN curl https://glide.sh/get | sh
 
-RUN mkdir -p /go/src/github.com/tendermint/go-p2p
-WORKDIR /go/src/github.com/tendermint/go-p2p
+RUN mkdir -p /go/src/github.com/tendermint/tendermint/p2p
+WORKDIR /go/src/github.com/tendermint/tendermint/p2p
 
-COPY glide.yaml /go/src/github.com/tendermint/go-p2p/
-COPY glide.lock /go/src/github.com/tendermint/go-p2p/
+COPY glide.yaml /go/src/github.com/tendermint/tendermint/p2p/
+COPY glide.lock /go/src/github.com/tendermint/tendermint/p2p/
 
 RUN glide install
 
-COPY . /go/src/github.com/tendermint/go-p2p
+COPY . /go/src/github.com/tendermint/tendermint/p2p
diff --git a/p2p/README.md b/p2p/README.md
index 236efd36..bf0a5c4d 100644
--- a/p2p/README.md
+++ b/p2p/README.md
@@ -1,8 +1,8 @@
-# `tendermint/go-p2p`
+# `tendermint/tendermint/p2p`
 
-[![CircleCI](https://circleci.com/gh/tendermint/go-p2p.svg?style=svg)](https://circleci.com/gh/tendermint/go-p2p)
+[![CircleCI](https://circleci.com/gh/tendermint/tendermint/p2p.svg?style=svg)](https://circleci.com/gh/tendermint/tendermint/p2p)
 
-`tendermint/go-p2p` provides an abstraction around peer-to-peer communication.<br/>
+`tendermint/tendermint/p2p` provides an abstraction around peer-to-peer communication.<br/>
 
 ## Peer/MConnection/Channel
 
diff --git a/p2p/connection_test.go b/p2p/connection_test.go
index 33d8adfd..993d2d73 100644
--- a/p2p/connection_test.go
+++ b/p2p/connection_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	p2p "github.com/tendermint/go-p2p"
+	p2p "github.com/tendermint/tendermint/p2p"
 )
 
 func createMConnection(conn net.Conn) *p2p.MConnection {
diff --git a/p2p/listener.go b/p2p/listener.go
index 51beb5e2..2acf4d06 100644
--- a/p2p/listener.go
+++ b/p2p/listener.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-p2p/upnp"
+	"github.com/tendermint/tendermint/p2p/upnp"
 )
 
 type Listener interface {
diff --git a/rpc/tendermint/core/pipe.go b/rpc/tendermint/core/pipe.go
index 4993ed99..d4a1d127 100644
--- a/rpc/tendermint/core/pipe.go
+++ b/rpc/tendermint/core/pipe.go
@@ -4,7 +4,7 @@ import (
 	cfg "github.com/tendermint/go-config"
 
 	crypto "github.com/tendermint/go-crypto"
-	p2p "github.com/tendermint/go-p2p"
+	p2p "github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/consensus"
 	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/state/txindex"
diff --git a/rpc/tendermint/core/types/responses.go b/rpc/tendermint/core/types/responses.go
index 6f276def..f88b297e 100644
--- a/rpc/tendermint/core/types/responses.go
+++ b/rpc/tendermint/core/types/responses.go
@@ -6,7 +6,7 @@ import (
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/go-crypto"
 	data "github.com/tendermint/go-wire/data"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/rpc/types"
 	"github.com/tendermint/go-wire"
 	"github.com/tendermint/tendermint/types"
diff --git a/rpc/tendermint/core/types/responses_test.go b/rpc/tendermint/core/types/responses_test.go
index 69ee4fae..8eef1979 100644
--- a/rpc/tendermint/core/types/responses_test.go
+++ b/rpc/tendermint/core/types/responses_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/go-p2p"
+	"github.com/tendermint/tendermint/p2p"
 )
 
 func TestStatusIndexer(t *testing.T) {
diff --git a/test/test_libs.sh b/test/test_libs.sh
index cb5090e1..1d57ae04 100644
--- a/test/test_libs.sh
+++ b/test/test_libs.sh
@@ -14,7 +14,7 @@ fi
 
 # some libs are tested with go, others with make
 # TODO: should be all make (post repo merge)
-LIBS_GO_TEST=(tmlibs/clist tmlibs/common go-config go-crypto tmlibs/db tmlibs/events go-merkle go-p2p)
+LIBS_GO_TEST=(tmlibs/clist tmlibs/common go-config go-crypto tmlibs/db tmlibs/events go-merkle tendermint/p2p)
 LIBS_MAKE_TEST=(tendermint/rpc go-wire abci)
 
 for lib in "${LIBS_GO_TEST[@]}"; do