diff --git a/CHANGELOG.md b/p2p/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to p2p/CHANGELOG.md
diff --git a/Dockerfile b/p2p/Dockerfile
similarity index 100%
rename from Dockerfile
rename to p2p/Dockerfile
diff --git a/LICENSE b/p2p/LICENSE
similarity index 100%
rename from LICENSE
rename to p2p/LICENSE
diff --git a/README.md b/p2p/README.md
similarity index 100%
rename from README.md
rename to p2p/README.md
diff --git a/addrbook.go b/p2p/addrbook.go
similarity index 100%
rename from addrbook.go
rename to p2p/addrbook.go
diff --git a/addrbook_test.go b/p2p/addrbook_test.go
similarity index 100%
rename from addrbook_test.go
rename to p2p/addrbook_test.go
diff --git a/config.go b/p2p/config.go
similarity index 100%
rename from config.go
rename to p2p/config.go
diff --git a/connection.go b/p2p/connection.go
similarity index 100%
rename from connection.go
rename to p2p/connection.go
diff --git a/connection_test.go b/p2p/connection_test.go
similarity index 100%
rename from connection_test.go
rename to p2p/connection_test.go
diff --git a/fuzz.go b/p2p/fuzz.go
similarity index 100%
rename from fuzz.go
rename to p2p/fuzz.go
diff --git a/glide.lock b/p2p/glide.lock
similarity index 100%
rename from glide.lock
rename to p2p/glide.lock
diff --git a/glide.yaml b/p2p/glide.yaml
similarity index 100%
rename from glide.yaml
rename to p2p/glide.yaml
diff --git a/ip_range_counter.go b/p2p/ip_range_counter.go
similarity index 100%
rename from ip_range_counter.go
rename to p2p/ip_range_counter.go
diff --git a/listener.go b/p2p/listener.go
similarity index 100%
rename from listener.go
rename to p2p/listener.go
diff --git a/listener_test.go b/p2p/listener_test.go
similarity index 100%
rename from listener_test.go
rename to p2p/listener_test.go
diff --git a/log.go b/p2p/log.go
similarity index 100%
rename from log.go
rename to p2p/log.go
diff --git a/netaddress.go b/p2p/netaddress.go
similarity index 100%
rename from netaddress.go
rename to p2p/netaddress.go
diff --git a/netaddress_test.go b/p2p/netaddress_test.go
similarity index 100%
rename from netaddress_test.go
rename to p2p/netaddress_test.go
diff --git a/peer.go b/p2p/peer.go
similarity index 100%
rename from peer.go
rename to p2p/peer.go
diff --git a/peer_set.go b/p2p/peer_set.go
similarity index 100%
rename from peer_set.go
rename to p2p/peer_set.go
diff --git a/peer_set_test.go b/p2p/peer_set_test.go
similarity index 100%
rename from peer_set_test.go
rename to p2p/peer_set_test.go
diff --git a/peer_test.go b/p2p/peer_test.go
similarity index 100%
rename from peer_test.go
rename to p2p/peer_test.go
diff --git a/pex_reactor.go b/p2p/pex_reactor.go
similarity index 100%
rename from pex_reactor.go
rename to p2p/pex_reactor.go
diff --git a/pex_reactor_test.go b/p2p/pex_reactor_test.go
similarity index 100%
rename from pex_reactor_test.go
rename to p2p/pex_reactor_test.go
diff --git a/secret_connection.go b/p2p/secret_connection.go
similarity index 100%
rename from secret_connection.go
rename to p2p/secret_connection.go
diff --git a/secret_connection_test.go b/p2p/secret_connection_test.go
similarity index 100%
rename from secret_connection_test.go
rename to p2p/secret_connection_test.go
diff --git a/switch.go b/p2p/switch.go
similarity index 100%
rename from switch.go
rename to p2p/switch.go
diff --git a/switch_test.go b/p2p/switch_test.go
similarity index 100%
rename from switch_test.go
rename to p2p/switch_test.go
diff --git a/types.go b/p2p/types.go
similarity index 100%
rename from types.go
rename to p2p/types.go
diff --git a/upnp/README.md b/p2p/upnp/README.md
similarity index 100%
rename from upnp/README.md
rename to p2p/upnp/README.md
diff --git a/upnp/log.go b/p2p/upnp/log.go
similarity index 100%
rename from upnp/log.go
rename to p2p/upnp/log.go
diff --git a/upnp/probe.go b/p2p/upnp/probe.go
similarity index 100%
rename from upnp/probe.go
rename to p2p/upnp/probe.go
diff --git a/upnp/upnp.go b/p2p/upnp/upnp.go
similarity index 100%
rename from upnp/upnp.go
rename to p2p/upnp/upnp.go
diff --git a/util.go b/p2p/util.go
similarity index 100%
rename from util.go
rename to p2p/util.go
diff --git a/version.go b/p2p/version.go
similarity index 100%
rename from version.go
rename to p2p/version.go