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/api/api.go b/api/api.go
index d378de1..e6d8eee 100644
--- a/api/api.go
+++ b/api/api.go
@@ -21,8 +21,8 @@
 
 	"net"
 
-	"github.com/30x/apid-core"
-	"github.com/30x/goscaffold"
+	"github.com/apid/apid-core"
+	"github.com/apid/goscaffold"
 	"github.com/gorilla/mux"
 )
 
diff --git a/api/api_suite_test.go b/api/api_suite_test.go
index 4ae9ca2..f98c8df 100644
--- a/api/api_suite_test.go
+++ b/api/api_suite_test.go
@@ -22,8 +22,8 @@
 )
 
 import (
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/factory"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/factory"
 	"net/http/httptest"
 	"os"
 )
diff --git a/config/config.go b/config/config.go
index 6481dc6..d7df182 100644
--- a/config/config.go
+++ b/config/config.go
@@ -15,7 +15,7 @@
 package config
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/spf13/viper"
 	"log"
 	"os"
diff --git a/data/data.go b/data/data.go
index bc14738..744ba6f 100644
--- a/data/data.go
+++ b/data/data.go
@@ -18,10 +18,10 @@
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/api"
-	"github.com/30x/apid-core/data/wrap"
-	"github.com/30x/apid-core/logger"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/api"
+	"github.com/apid/apid-core/data/wrap"
+	"github.com/apid/apid-core/logger"
 	"github.com/Sirupsen/logrus"
 	"github.com/mattn/go-sqlite3"
 	"os"
diff --git a/data/data_suite_test.go b/data/data_suite_test.go
index 1953ad0..16b4142 100644
--- a/data/data_suite_test.go
+++ b/data/data_suite_test.go
@@ -18,8 +18,8 @@
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/factory"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/factory"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/data/data_test.go b/data/data_test.go
index c37c9b0..fee0d8d 100644
--- a/data/data_test.go
+++ b/data/data_test.go
@@ -16,8 +16,8 @@
 
 import (
 	"fmt"
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/data"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/data"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"math/rand"
diff --git a/data/wrap/connection.go b/data/wrap/connection.go
index 22f93a2..9f9a35d 100644
--- a/data/wrap/connection.go
+++ b/data/wrap/connection.go
@@ -19,7 +19,7 @@
 
 	"sync/atomic"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/mattn/go-sqlite3"
 )
 
diff --git a/data/wrap/driver.go b/data/wrap/driver.go
index 7b92579..f026ff9 100644
--- a/data/wrap/driver.go
+++ b/data/wrap/driver.go
@@ -20,7 +20,7 @@
 
 	"sync/atomic"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/mattn/go-sqlite3"
 )
 
diff --git a/data/wrap/statement.go b/data/wrap/statement.go
index 3853cc8..cb6f6e3 100644
--- a/data/wrap/statement.go
+++ b/data/wrap/statement.go
@@ -16,7 +16,7 @@
 
 import (
 	"database/sql/driver"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/mattn/go-sqlite3"
 )
 
@@ -65,4 +65,4 @@
 
 	s.log.Debugf("end query: %#v", rows)
 	return
-}
\ No newline at end of file
+}
diff --git a/data/wrap/transaction.go b/data/wrap/transaction.go
index a6435da..f1653dd 100644
--- a/data/wrap/transaction.go
+++ b/data/wrap/transaction.go
@@ -15,7 +15,7 @@
 package wrap
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/mattn/go-sqlite3"
 )
 
diff --git a/events/event_manager.go b/events/event_manager.go
index f337409..87e7dea 100644
--- a/events/event_manager.go
+++ b/events/event_manager.go
@@ -18,7 +18,7 @@
 	"sync"
 	"reflect"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 )
 
 // events published to a given channel are processed entirely in order, though delivery to listeners is async
diff --git a/events/events.go b/events/events.go
index d2121d7..cdbe61d 100644
--- a/events/events.go
+++ b/events/events.go
@@ -14,7 +14,7 @@
 
 package events
 
-import "github.com/30x/apid-core"
+import "github.com/apid/apid-core"
 
 // simple pub/sub to deliver events to listeners based on a selector string
 
diff --git a/events/events_suite_test.go b/events/events_suite_test.go
index 8c29063..01dc88c 100644
--- a/events/events_suite_test.go
+++ b/events/events_suite_test.go
@@ -19,8 +19,8 @@
 	. "github.com/onsi/gomega"
 
 	"testing"
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/factory"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/factory"
 )
 
 var _ = BeforeSuite(func() {
diff --git a/events/events_test.go b/events/events_test.go
index c129291..d4d2703 100644
--- a/events/events_test.go
+++ b/events/events_test.go
@@ -18,8 +18,8 @@
 	"sync"
 	"sync/atomic"
 
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/events"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/events"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
diff --git a/factory/factory.go b/factory/factory.go
index d56d37f..4ea80f7 100644
--- a/factory/factory.go
+++ b/factory/factory.go
@@ -15,12 +15,12 @@
 package factory
 
 import (
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/api"
-	"github.com/30x/apid-core/config"
-	"github.com/30x/apid-core/data"
-	"github.com/30x/apid-core/events"
-	"github.com/30x/apid-core/logger"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/api"
+	"github.com/apid/apid-core/config"
+	"github.com/apid/apid-core/data"
+	"github.com/apid/apid-core/events"
+	"github.com/apid/apid-core/logger"
 )
 
 // Don't use values directly - pass to apid.Initialize()
diff --git a/glide.yaml b/glide.yaml
index 8593985..2ea68e4 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,8 +22,8 @@
   version: v1.2.0
 - package: github.com/gorilla/mux
   version: v1.3.0
-- package: github.com/30x/goscaffold
-  version: 68835e7a23284346c2a11ad43effe69197c71b26
+- package: github.com/apid/goscaffold
+  version: master
 testImport:
 - package: github.com/onsi/ginkgo/ginkgo
 - package: github.com/onsi/gomega
diff --git a/logger/logger.go b/logger/logger.go
index 7c16b17..11f12e0 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -19,7 +19,7 @@
 	"os"
 	"time"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/Sirupsen/logrus"
 )