diff --git a/README.md b/README.md
index 430c15a..3c35d05 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # apidApigeeSync
 
-This core plugin for [apid](http://github.com/30x/apid) connects to the Apigee Change Agent and publishes the data
+This core plugin for [apid](http://github.com/apid/apid) connects to the Apigee Change Agent and publishes the data
 changes events onto the apid Event service. It also coordinates DB initialization for plugins on startup.
 
 ### Configuration
diff --git a/api.go b/api.go
index 90ed3d3..73399d7 100644
--- a/api.go
+++ b/api.go
@@ -16,7 +16,7 @@
 
 import (
 	"encoding/json"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"net/http"
 	"strconv"
 	"time"
diff --git a/apigeeSync_suite_test.go b/apigeeSync_suite_test.go
index 8594d17..5055f68 100644
--- a/apigeeSync_suite_test.go
+++ b/apigeeSync_suite_test.go
@@ -24,9 +24,9 @@
 	"testing"
 	"time"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 
-	"github.com/30x/apid-core/factory"
+	"github.com/apid/apid-core/factory"
 )
 
 var (
diff --git a/apigee_sync.go b/apigee_sync.go
index 188e0dd..8a23079 100644
--- a/apigee_sync.go
+++ b/apigee_sync.go
@@ -15,7 +15,7 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"net/http"
 	"time"
 )
diff --git a/apigee_sync_test.go b/apigee_sync_test.go
index bd85b97..9a6bf6b 100644
--- a/apigee_sync_test.go
+++ b/apigee_sync_test.go
@@ -15,7 +15,7 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/change_test.go b/change_test.go
index e7eed6f..511eb82 100644
--- a/change_test.go
+++ b/change_test.go
@@ -15,7 +15,7 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/cover.sh b/cover.sh
index c866ea1..ee59214 100755
--- a/cover.sh
+++ b/cover.sh
@@ -19,7 +19,7 @@
 set -e
 echo "mode: atomic" > coverage.txt
 
-go test -coverprofile=profile.out -covermode=atomic github.com/30x/apidApigeeSync
+go test -coverprofile=profile.out -covermode=atomic github.com/apid/apidApigeeSync
 if [ -f profile.out ]; then
     tail -n +2 profile.out >> coverage.txt
     rm profile.out
diff --git a/data.go b/data.go
index 3c6994b..4376a76 100644
--- a/data.go
+++ b/data.go
@@ -21,7 +21,7 @@
 	"fmt"
 	"sync"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 	"sort"
 	"strings"
diff --git a/data_test.go b/data_test.go
index 0173671..53b7509 100644
--- a/data_test.go
+++ b/data_test.go
@@ -15,13 +15,13 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core/data"
+	"github.com/apid/apid-core/data"
 	"github.com/apigee-labs/transicator/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"sort"
 	"strconv"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 )
 
 var _ = Describe("data access tests", func() {
diff --git a/glide.yaml b/glide.yaml
index 7f93679..43bce39 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-package: github.com/30x/apidApigeeSync
+package: github.com/apid/apidApigeeSync
 import:
-- package: github.com/30x/apid-core
-  version: master
+- package: github.com/apid/apid-core
+  version: 30xtoapid
 testImport:
 - package: github.com/onsi/ginkgo/ginkgo
 - package: github.com/onsi/gomega
diff --git a/init.go b/init.go
index 0cedd9a..b64634d 100644
--- a/init.go
+++ b/init.go
@@ -21,7 +21,7 @@
 	"os"
 	"time"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 )
 
 const (
diff --git a/init_test.go b/init_test.go
index 1f4ca21..03e5450 100644
--- a/init_test.go
+++ b/init_test.go
@@ -15,7 +15,7 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/listener.go b/listener.go
index 55492c3..e9f24ad 100644
--- a/listener.go
+++ b/listener.go
@@ -16,7 +16,7 @@
 
 import (
 	"errors"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 )
 
diff --git a/listener_test.go b/listener_test.go
index 55df0a5..54974eb 100644
--- a/listener_test.go
+++ b/listener_test.go
@@ -18,7 +18,7 @@
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 	"os"
 	"reflect"
diff --git a/mock_server.go b/mock_server.go
index 94a0651..0100ef5 100644
--- a/mock_server.go
+++ b/mock_server.go
@@ -28,7 +28,7 @@
 	"net"
 
 	"database/sql"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/pluginData.go b/pluginData.go
index c68928f..2dc2d9f 100644
--- a/pluginData.go
+++ b/pluginData.go
@@ -14,7 +14,7 @@
 
 package apidApigeeSync
 
-import "github.com/30x/apid-core"
+import "github.com/apid/apid-core"
 
 var pluginData = apid.PluginData{
 	Name:    "apidApigeeSync",
diff --git a/snapshot.go b/snapshot.go
index ebcc901..df4d63f 100644
--- a/snapshot.go
+++ b/snapshot.go
@@ -15,8 +15,8 @@
 package apidApigeeSync
 
 import (
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/data"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/data"
 	"github.com/apigee-labs/transicator/common"
 	"net/http"
 	"os"