diff --git a/Dockerfile b/Dockerfile
index 8dd5e4b..1183ed9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,9 @@ FROM golang:1.7
 COPY Dockerfile.run /go/bin/Dockerfile
 COPY ./www /go/bin/www
 
-COPY . /go/src/github.com/franela/play-with-docker
+COPY . /go/src/github.com/play-with-docker/play-with-docker
 
-WORKDIR /go/src/github.com/franela/play-with-docker
+WORKDIR /go/src/github.com/play-with-docker/play-with-docker
 
 RUN go get -v -d ./...
 
diff --git a/LICENSE b/LICENSE
index 765f722..bfcd944 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 franela
+Copyright (c) 2016 Marcos Lilljedhal and Jonathan Leibiusky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/api.go b/api.go
index 1bcb75b..8f7cac9 100644
--- a/api.go
+++ b/api.go
@@ -10,13 +10,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/franela/play-with-docker/config"
-	"github.com/franela/play-with-docker/handlers"
-	"github.com/franela/play-with-docker/services"
-	"github.com/franela/play-with-docker/templates"
 	gh "github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/miekg/dns"
+	"github.com/play-with-docker/play-with-docker/config"
+	"github.com/play-with-docker/play-with-docker/handlers"
+	"github.com/play-with-docker/play-with-docker/services"
+	"github.com/play-with-docker/play-with-docker/templates"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/urfave/negroni"
 )
@@ -219,5 +219,3 @@ func handleDnsRequest(w dns.ResponseWriter, r *dns.Msg) {
 		}
 	}
 }
-
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 97566b4..52b883d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
         # use the latest golang image
         image: golang
         # go to the right place and starts the app
-        command: /bin/sh -c 'cd /go/src/github.com/franela/play-with-docker; go run api.go -save ./pwd/sessions1 -name pwd1 -cname host1'
+        command: /bin/sh -c 'cd /go/src/github.com/play-with-docker/play-with-docker; go run api.go -save ./pwd/sessions1 -name pwd1 -cname host1'
         volumes:
             # since this app creates networks and launches containers, we need to talk to docker daemon
             - /var/run/docker.sock:/var/run/docker.sock
@@ -29,7 +29,7 @@ services:
         # use the latest golang image
         image: golang
         # go to the right place and starts the app
-        command: /bin/sh -c 'cd /go/src/github.com/franela/play-with-docker; go run api.go -save ./pwd/sessions2 -name pwd2 -cname host2'
+        command: /bin/sh -c 'cd /go/src/github.com/play-with-docker/play-with-docker; go run api.go -save ./pwd/sessions2 -name pwd2 -cname host2'
         volumes:
             # since this app creates networks and launches containers, we need to talk to docker daemon
             - /var/run/docker.sock:/var/run/docker.sock
diff --git a/handlers/delete_instance.go b/handlers/delete_instance.go
index 0e195df..76e0265 100644
--- a/handlers/delete_instance.go
+++ b/handlers/delete_instance.go
@@ -3,8 +3,8 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/franela/play-with-docker/services"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func DeleteInstance(rw http.ResponseWriter, req *http.Request) {
diff --git a/handlers/get_instance_images.go b/handlers/get_instance_images.go
index ba8d026..f102044 100644
--- a/handlers/get_instance_images.go
+++ b/handlers/get_instance_images.go
@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/franela/play-with-docker/services"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func GetInstanceImages(rw http.ResponseWriter, req *http.Request) {
 	instanceImages := services.InstanceImages()
 	json.NewEncoder(rw).Encode(instanceImages)
 }
-
diff --git a/handlers/get_session.go b/handlers/get_session.go
index a86bfe4..741d75b 100644
--- a/handlers/get_session.go
+++ b/handlers/get_session.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/franela/play-with-docker/services"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func GetSession(rw http.ResponseWriter, req *http.Request) {
diff --git a/handlers/new_instance.go b/handlers/new_instance.go
index e4dd39e..4ceb954 100644
--- a/handlers/new_instance.go
+++ b/handlers/new_instance.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/franela/play-with-docker/services"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func NewInstance(rw http.ResponseWriter, req *http.Request) {
diff --git a/handlers/new_session.go b/handlers/new_session.go
index c01f71d..d4ce9b6 100644
--- a/handlers/new_session.go
+++ b/handlers/new_session.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/franela/play-with-docker/config"
-	"github.com/franela/play-with-docker/services"
+	"github.com/play-with-docker/play-with-docker/config"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 type NewSessionResponse struct {
diff --git a/handlers/ping.go b/handlers/ping.go
index beba80a..ccf5cec 100644
--- a/handlers/ping.go
+++ b/handlers/ping.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/franela/play-with-docker/config"
+	"github.com/play-with-docker/play-with-docker/config"
 	"github.com/shirou/gopsutil/load"
 )
 
diff --git a/handlers/reverseproxy.go b/handlers/reverseproxy.go
index cbc5ae8..adef966 100644
--- a/handlers/reverseproxy.go
+++ b/handlers/reverseproxy.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/franela/play-with-docker/config"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/config"
 )
 
 func getTargetInfo(vars map[string]string, req *http.Request) (string, string) {
diff --git a/handlers/set_keys.go b/handlers/set_keys.go
index 9441dd9..53271a6 100644
--- a/handlers/set_keys.go
+++ b/handlers/set_keys.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/franela/play-with-docker/services"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func SetKeys(rw http.ResponseWriter, req *http.Request) {
diff --git a/handlers/ws.go b/handlers/ws.go
index bfba171..b51b4b6 100644
--- a/handlers/ws.go
+++ b/handlers/ws.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/franela/play-with-docker/services"
 	"github.com/googollee/go-socket.io"
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func WS(so socketio.Socket) {
diff --git a/services/recaptcha.go b/services/recaptcha.go
index 1efe589..e9455ac 100644
--- a/services/recaptcha.go
+++ b/services/recaptcha.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/franela/play-with-docker/config"
 	"github.com/gorilla/securecookie"
+	"github.com/play-with-docker/play-with-docker/config"
 	"github.com/twinj/uuid"
 )
 
diff --git a/services/session.go b/services/session.go
index 4c975df..3e7a7a6 100644
--- a/services/session.go
+++ b/services/session.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/client"
-	"github.com/franela/play-with-docker/config"
 	"github.com/googollee/go-socket.io"
+	"github.com/play-with-docker/play-with-docker/config"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/twinj/uuid"
 )
diff --git a/templates/welcome.go b/templates/welcome.go
index d8eed5a..1e5de51 100644
--- a/templates/welcome.go
+++ b/templates/welcome.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"html/template"
 
-	"github.com/franela/play-with-docker/services"
+	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func GetWelcomeTemplate() ([]byte, error) {