diff --git a/README.md b/README.md
index eae8a61..bb771ef 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Tunnel [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/mmatczuk/tunnel) [![Go Report Card](https://goreportcard.com/badge/github.com/mmatczuk/tunnel)](https://goreportcard.com/report/github.com/mmatczuk/tunnel) [![Build Status](http://img.shields.io/travis/mmatczuk/tunnel.svg?style=flat-square)](https://travis-ci.org/mmatczuk/tunnel)
+# Tunnel [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/mmatczuk/go-http-tunnel) [![Go Report Card](https://goreportcard.com/badge/github.com/mmatczuk/go-http-tunnel)](https://goreportcard.com/report/github.com/mmatczuk/go-http-tunnel) [![Build Status](http://img.shields.io/travis/mmatczuk/go-http-tunnel.svg?style=flat-square)](https://travis-ci.org/mmatczuk/go-http-tunnel)
 
 Tunnel is fast and secure server/client package that enables proxying public connections to your local machine over a tunnel connection from the local machine to the public server. In other words you can share your localhost even if it doesn't have a public IP or if it's not reachable from outside.
 
diff --git a/benchmark/report/README.md b/benchmark/README.md
similarity index 90%
rename from benchmark/report/README.md
rename to benchmark/README.md
index 428d147..ba7a72c 100644
--- a/benchmark/report/README.md
+++ b/benchmark/README.md
@@ -1,6 +1,6 @@
 # Benchmark report
 
-The benchmark compares [tunnel](https://github.com/mmatczuk/tunnel) to [koding tunnel](https://github.com/koding/tunnel) on serving 184 midsized files that were gathered by saving `amazon.com` for offline view. The data set consists of images and text data (js, css, html). On start client loads the files into memory and act as a file server.
+The benchmark compares [tunnel](https://github.com/mmatczuk/go-http-tunnel) to [koding tunnel](https://github.com/koding/tunnel) on serving 184 midsized files that were gathered by saving `amazon.com` for offline view. The data set consists of images and text data (js, css, html). On start client loads the files into memory and act as a file server.
 
 The diagrams were rendered using [hdrhistogram](http://hdrhistogram.github.io/HdrHistogram/plotFiles.html) and the input files were generated with help of [github.com/codahale/hdrhistogram](https://github.com/codahale/hdrhistogram) library. The vegeta raw results were corrected for stalls using [hdr correction method](https://godoc.org/github.com/codahale/hdrhistogram#Histogram.RecordCorrectedValue).
 
diff --git a/benchmark/report/constload.png b/benchmark/constload.png
similarity index 100%
rename from benchmark/report/constload.png
rename to benchmark/constload.png
diff --git a/benchmark/report/spike.png b/benchmark/spike.png
similarity index 100%
rename from benchmark/report/spike.png
rename to benchmark/spike.png
diff --git a/client.go b/client.go
index 30b317c..52833ba 100644
--- a/client.go
+++ b/client.go
@@ -11,8 +11,8 @@ import (
 
 	"golang.org/x/net/http2"
 
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 var (
diff --git a/client_test.go b/client_test.go
index 0b37070..0f9c90f 100644
--- a/client_test.go
+++ b/client_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	"github.com/mmatczuk/tunnel/mock"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/mock"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 func TestClient_Dial(t *testing.T) {
diff --git a/cmd/cmd/log.go b/cmd/cmd/log.go
index 693864d..7ef204d 100644
--- a/cmd/cmd/log.go
+++ b/cmd/cmd/log.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	kitlog "github.com/go-kit/kit/log"
-	"github.com/mmatczuk/tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/log"
 )
 
 // NewLogger returns logfmt based logger, printing messages up to log level
diff --git a/cmd/tunnel/config.go b/cmd/tunnel/config.go
index 663b36a..2d3cfe3 100644
--- a/cmd/tunnel/config.go
+++ b/cmd/tunnel/config.go
@@ -8,7 +8,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 type BackoffConfig struct {
diff --git a/cmd/tunnel/tunnel.go b/cmd/tunnel/tunnel.go
index 933ff26..6e45088 100644
--- a/cmd/tunnel/tunnel.go
+++ b/cmd/tunnel/tunnel.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/cenkalti/backoff"
 	"github.com/google/gops/agent"
-	"github.com/mmatczuk/tunnel"
-	"github.com/mmatczuk/tunnel/cmd/cmd"
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel"
+	"github.com/mmatczuk/go-http-tunnel/cmd/cmd"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 func main() {
diff --git a/cmd/tunneld/tunneld.go b/cmd/tunneld/tunneld.go
index 15e4713..c44e45a 100644
--- a/cmd/tunneld/tunneld.go
+++ b/cmd/tunneld/tunneld.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/google/gops/agent"
-	"github.com/mmatczuk/tunnel"
-	"github.com/mmatczuk/tunnel/cmd/cmd"
-	"github.com/mmatczuk/tunnel/id"
+	"github.com/mmatczuk/go-http-tunnel"
+	"github.com/mmatczuk/go-http-tunnel/cmd/cmd"
+	"github.com/mmatczuk/go-http-tunnel/id"
 )
 
 func main() {
diff --git a/httpproxy.go b/httpproxy.go
index 8f09a34..f03f4ce 100644
--- a/httpproxy.go
+++ b/httpproxy.go
@@ -11,8 +11,8 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 // HTTPProxy forwards HTTP traffic.
diff --git a/integrationtest/integration_test.go b/integrationtest/integration_test.go
index 43232bb..71e3283 100644
--- a/integrationtest/integration_test.go
+++ b/integrationtest/integration_test.go
@@ -12,10 +12,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mmatczuk/tunnel"
-	"github.com/mmatczuk/tunnel/id"
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel"
+	"github.com/mmatczuk/go-http-tunnel/id"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 const (
diff --git a/log/filterlogger_test.go b/log/filterlogger_test.go
index 7f9772a..5c8c052 100644
--- a/log/filterlogger_test.go
+++ b/log/filterlogger_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/mmatczuk/tunnel/mock"
+	"github.com/mmatczuk/go-http-tunnel/mock"
 )
 
 func TestFilterLogger_Log(t *testing.T) {
diff --git a/log/log_test.go b/log/log_test.go
index a0f680b..42c7ce9 100644
--- a/log/log_test.go
+++ b/log/log_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/mmatczuk/tunnel/mock"
+	"github.com/mmatczuk/go-http-tunnel/mock"
 )
 
 func TestContext_Log(t *testing.T) {
diff --git a/mock/backoff.go b/mock/backoff.go
index 3b2c8e8..20f2102 100644
--- a/mock/backoff.go
+++ b/mock/backoff.go
@@ -1,5 +1,5 @@
 // Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/mmatczuk/tunnel (interfaces: Backoff)
+// Source: github.com/mmatczuk/go-http-tunnel (interfaces: Backoff)
 
 package mock
 
diff --git a/mock/logger.go b/mock/logger.go
index 035aeed..663506c 100644
--- a/mock/logger.go
+++ b/mock/logger.go
@@ -1,5 +1,5 @@
 // Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/mmatczuk/tunnel/log (interfaces: Logger)
+// Source: github.com/mmatczuk/go-http-tunnel/log (interfaces: Logger)
 
 package mock
 
diff --git a/pool.go b/pool.go
index f6336ab..586d658 100644
--- a/pool.go
+++ b/pool.go
@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/net/http2"
 
-	"github.com/mmatczuk/tunnel/id"
+	"github.com/mmatczuk/go-http-tunnel/id"
 )
 
 type onDisconnectListener func(identifier id.ID)
diff --git a/proxy.go b/proxy.go
index a0fd33c..7ff8ee4 100644
--- a/proxy.go
+++ b/proxy.go
@@ -3,7 +3,7 @@ package tunnel
 import (
 	"io"
 
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 // ProxyFunc is responsible for forwarding a remote connection to local server
diff --git a/registry.go b/registry.go
index b8f696e..4b1f9f1 100644
--- a/registry.go
+++ b/registry.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/mmatczuk/tunnel/id"
-	"github.com/mmatczuk/tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/id"
+	"github.com/mmatczuk/go-http-tunnel/log"
 )
 
 // RegistryItem holds information about hosts and listeners associated with a
diff --git a/server.go b/server.go
index 5ba11ee..a7bb738 100644
--- a/server.go
+++ b/server.go
@@ -13,9 +13,9 @@ import (
 
 	"golang.org/x/net/http2"
 
-	"github.com/mmatczuk/tunnel/id"
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/id"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 // ServerConfig defines configuration for the Server.
diff --git a/tcpproxy.go b/tcpproxy.go
index 87fe30f..c6c7261 100644
--- a/tcpproxy.go
+++ b/tcpproxy.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"net"
 
-	"github.com/mmatczuk/tunnel/log"
-	"github.com/mmatczuk/tunnel/proto"
+	"github.com/mmatczuk/go-http-tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/proto"
 )
 
 // TCPProxy forwards TCP streams.
diff --git a/utils.go b/utils.go
index f3d4e3b..efd4c57 100644
--- a/utils.go
+++ b/utils.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mmatczuk/tunnel/log"
+	"github.com/mmatczuk/go-http-tunnel/log"
 )
 
 type closeWriter interface {