diff --git a/.goxc.json b/.goxc.json
index b508a99..9b1448e 100644
--- a/.goxc.json
+++ b/.goxc.json
@@ -15,10 +15,10 @@
   "debs": {
       "metadata": {
         "description": "Docker Volume Plugin - Netshare",
-        "maintainer": "Jeremy Unruh (https://github.com/gondor)"
+        "maintainer": "Jeremy Unruh (https://github.com/ContainX)"
       },
       "metadata-deb": {
-        "Homepage": "https://github.com/gondor/docker-volume-netshare"
+        "Homepage": "https://github.com/ContainX/docker-volume-netshare"
       },
       "other-mapped-files": {
         "/": "support/sysvinit-debian/"
diff --git a/README.md b/README.md
index d59afe3..d067bcb 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
 
-[![Build Status](https://travis-ci.org/gondor/docker-volume-netshare.svg)](https://travis-ci.org/gondor/docker-volume-netshare) [![release](http://github-release-version.herokuapp.com/github/gondor/docker-volume-netshare/release.svg?style=flat)](https://github.com/gondor/docker-volume-netshare/releases/latest)
+[![Build Status](https://travis-ci.org/ContainX/docker-volume-netshare.svg)](https://travis-ci.org/ContainX/docker-volume-netshare) [![release](http://github-release-version.herokuapp.com/github/ContainX/docker-volume-netshare/release.svg?style=flat)](https://github.com/ContainX/docker-volume-netshare/releases/latest)
 
 Mount NFS v3/4, AWS EFS or CIFS inside your docker containers.  This is a docker plugin which enables these volume types to be directly mounted within a container.
 
+### [http://netshare.containx.io](http://netshare.containx.io)
+
 ## NFS Prerequisites on Linux
 
 NFS needs to be installed on Linux systems in order to properly mount NFS mounts.  
@@ -21,13 +23,13 @@ sudo mount -t nfs4 1.1.1.1:/mountpoint /target/mount
 #### From Source
 
 ```
-$ go get github.com/gondor/docker-volume-netshare
+$ go get github.com/ContainX/docker-volume-netshare
 $ go build
 ```
 
 #### From Binaries
 
-Binaries are available through GitHub releases.  You can download the appropriate binary, package and version from the [Releases](https://github.com/gondor/docker-volume-netshare/releases) page
+Binaries are available through GitHub releases.  You can download the appropriate binary, package and version from the [Releases](https://github.com/ContainX/docker-volume-netshare/releases) page
 
 #### On Ubuntu / Debian
 
@@ -36,7 +38,7 @@ The method below will install the sysvinit and /etc/default options that can be
 1. Install the Package
 
 ```
-  $ wget https://github.com/gondor/docker-volume-netshare/releases/download/v0.16/docker-volume-netshare_0.16_amd64.deb
+  $ wget https://github.com/ContainX/docker-volume-netshare/releases/download/v0.16/docker-volume-netshare_0.16_amd64.deb
   $ sudo dpkg -i docker-volume-netshare_0.16_amd64.deb
 ```
 
diff --git a/main.go b/main.go
index 7d54cc5..fa8c1df 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gondor/docker-volume-netshare/netshare"
+	"github.com/ContainX/docker-volume-netshare/netshare"
 )
 
 var VERSION string = ""
diff --git a/netshare/netshare.go b/netshare/netshare.go
index 3251634..008656d 100644
--- a/netshare/netshare.go
+++ b/netshare/netshare.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
-	"github.com/gondor/docker-volume-netshare/netshare/drivers"
+	"github.com/ContainX/docker-volume-netshare/netshare/drivers"
 	"github.com/spf13/cobra"
 	"os"
 	"path/filepath"
diff --git a/support/systemd/lib/systemd/system/docker-volume-netshare.service b/support/systemd/lib/systemd/system/docker-volume-netshare.service
index 0daa6ff..35ef7ac 100644
--- a/support/systemd/lib/systemd/system/docker-volume-netshare.service
+++ b/support/systemd/lib/systemd/system/docker-volume-netshare.service
@@ -1,9 +1,15 @@
 [Unit]
 Description=Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
+<<<<<<< HEAD
+Documentation=https://github.com/ContainX/docker-volume-netshare
+After=nfs-utils.service	docker.service
+Requires=docker.service
+=======
 Documentation=https://github.com/gondor/docker-volume-netshare
 After=nfs-utils.service
 Before=docker.service
 Requires=nfs-utils.service
+>>>>>>> b23fe656606d7043631ecf7c5e8f60cbd3185972
 
 
 [Service]
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 91b9117..255dd8b 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -21,5 +21,5 @@
 			"revisionTime": "2016-02-10T13:55:59Z"
 		}
 	],
-	"rootPath": "github.com/gondor/docker-volume-netshare"
+	"rootPath": "github.com/ContainX/docker-volume-netshare"
 }