diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6d364e1..ae319c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,4 +20,4 @@
 All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
\ No newline at end of file
+information on using pull requests.
diff --git a/LICENSE b/LICENSE
index 7a4a3ea..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
diff --git a/README.md b/README.md
index c7587cf..d920c97 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 apid-core is a library that provides a container for publishing APIs that provides core services to its plugins 
 including configuration, API publishing, data access, and a local pub/sub event system.
 
-Disambiguation: You might be looking for the executable builder, [apid](https://github.com/30x/apid).  
+Disambiguation: You might be looking for the executable builder, [apid](https://github.com/apid/apid).  
 
 ## Services
 
diff --git a/glide.yaml b/glide.yaml
index 8593985..ede006b 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-package: github.com/30x/apid-core
+package: github.com/apid/apid-core
 import:
 - package: github.com/Sirupsen/logrus
   version: v0.11.0
@@ -22,7 +22,7 @@
   version: v1.2.0
 - package: github.com/gorilla/mux
   version: v1.3.0
-- package: github.com/30x/goscaffold
+- package: github.com/apid/goscaffold
   version: 68835e7a23284346c2a11ad43effe69197c71b26
 testImport:
 - package: github.com/onsi/ginkgo/ginkgo