diff --git a/.air/knotserver.toml b/.air/knotserver.toml
index ce38a90f..18eacc00 100644
--- a/.air/knotserver.toml
+++ b/.air/knotserver.toml
@@ -1,5 +1,5 @@
 [build]
-cmd = 'go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=$(git describe --tags --long)" -o .bin/knot ./cmd/knot/'
+cmd = 'go build -ldflags "-X tangled.org/core/knotserver.version=$(git describe --tags --long)" -o .bin/knot ./cmd/knot/'
 bin = ".bin/knot server"
 root = "."
 
diff --git a/appview/cache/session/store.go b/appview/cache/session/store.go
index b9e0c3ea..a7a965f0 100644
--- a/appview/cache/session/store.go
+++ b/appview/cache/session/store.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"tangled.sh/tangled.sh/core/appview/cache"
+	"tangled.org/core/appview/cache"
 )
 
 type OAuthSession struct {
diff --git a/appview/commitverify/verify.go b/appview/commitverify/verify.go
index e3066df6..233ad918 100644
--- a/appview/commitverify/verify.go
+++ b/appview/commitverify/verify.go
@@ -4,9 +4,9 @@ import (
 	"log"
 
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/crypto"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/crypto"
+	"tangled.org/core/types"
 )
 
 type verifiedCommit struct {
diff --git a/appview/db/artifact.go b/appview/db/artifact.go
index e021d9c7..447d0015 100644
--- a/appview/db/artifact.go
+++ b/appview/db/artifact.go
@@ -8,7 +8,7 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/ipfs/go-cid"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type Artifact struct {
diff --git a/appview/db/issues.go b/appview/db/issues.go
index 75f47a7f..90350f1d 100644
--- a/appview/db/issues.go
+++ b/appview/db/issues.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/pagination"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/pagination"
 )
 
 type Issue struct {
@@ -216,9 +216,9 @@ func createNewIssue(tx *sql.Tx, issue *Issue) error {
 	// get next issue_id
 	var newIssueId int
 	err := tx.QueryRow(`
-		update repo_issue_seqs 
-		set next_issue_id = next_issue_id + 1 
-		where repo_at = ? 
+		update repo_issue_seqs
+		set next_issue_id = next_issue_id + 1
+		where repo_at = ?
 		returning next_issue_id - 1
 	`, issue.RepoAt).Scan(&newIssueId)
 	if err != nil {
diff --git a/appview/db/pipeline.go b/appview/db/pipeline.go
index b13647ff..684e84ba 100644
--- a/appview/db/pipeline.go
+++ b/appview/db/pipeline.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/go-git/go-git/v5/plumbing"
-	spindle "tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/workflow"
+	spindle "tangled.org/core/spindle/models"
+	"tangled.org/core/workflow"
 )
 
 type Pipeline struct {
diff --git a/appview/db/profile.go b/appview/db/profile.go
index fed673cf..da2945ca 100644
--- a/appview/db/profile.go
+++ b/appview/db/profile.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type RepoEvent struct {
diff --git a/appview/db/pulls.go b/appview/db/pulls.go
index ae332815..31494b3a 100644
--- a/appview/db/pulls.go
+++ b/appview/db/pulls.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/types"
 )
 
 type PullState int
diff --git a/appview/db/repos.go b/appview/db/repos.go
index 17c5a159..cee0e1ab 100644
--- a/appview/db/repos.go
+++ b/appview/db/repos.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type Repo struct {
diff --git a/appview/db/strings.go b/appview/db/strings.go
index 5f47ecff..1a8641c6 100644
--- a/appview/db/strings.go
+++ b/appview/db/strings.go
@@ -11,7 +11,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type String struct {
diff --git a/appview/dns/cloudflare.go b/appview/dns/cloudflare.go
index 6f000b49..c85f0209 100644
--- a/appview/dns/cloudflare.go
+++ b/appview/dns/cloudflare.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/cloudflare/cloudflare-go"
-	"tangled.sh/tangled.sh/core/appview/config"
+	"tangled.org/core/appview/config"
 )
 
 type Record struct {
diff --git a/appview/ingester.go b/appview/ingester.go
index fc759074..4e37802e 100644
--- a/appview/ingester.go
+++ b/appview/ingester.go
@@ -12,13 +12,13 @@ import (
 	"github.com/bluesky-social/jetstream/pkg/models"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/ipfs/go-cid"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/serververify"
-	"tangled.sh/tangled.sh/core/appview/validator"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/serververify"
+	"tangled.org/core/appview/validator"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
 )
 
 type Ingester struct {
diff --git a/appview/issues/issues.go b/appview/issues/issues.go
index 6643d293..37133a10 100644
--- a/appview/issues/issues.go
+++ b/appview/issues/issues.go
@@ -16,19 +16,19 @@ import (
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/go-chi/chi/v5"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/notify"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pagination"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/appview/validator"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/idresolver"
-	tlog "tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/notify"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pagination"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/appview/validator"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/idresolver"
+	tlog "tangled.org/core/log"
+	"tangled.org/core/tid"
 )
 
 type Issues struct {
diff --git a/appview/issues/router.go b/appview/issues/router.go
index 58492585..cee82035 100644
--- a/appview/issues/router.go
+++ b/appview/issues/router.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/middleware"
+	"tangled.org/core/appview/middleware"
 )
 
 func (i *Issues) Router(mw *middleware.Middleware) http.Handler {
diff --git a/appview/knots/knots.go b/appview/knots/knots.go
index 24e4bbe0..678a8e47 100644
--- a/appview/knots/knots.go
+++ b/appview/knots/knots.go
@@ -9,18 +9,18 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/serververify"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/middleware"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/serververify"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
diff --git a/appview/middleware/middleware.go b/appview/middleware/middleware.go
index 7bb4eee6..cd2dade3 100644
--- a/appview/middleware/middleware.go
+++ b/appview/middleware/middleware.go
@@ -12,13 +12,13 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pagination"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pagination"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
 )
 
 type Middleware struct {
diff --git a/appview/notify/merged_notifier.go b/appview/notify/merged_notifier.go
index 8eb72dd4..dcf61dd1 100644
--- a/appview/notify/merged_notifier.go
+++ b/appview/notify/merged_notifier.go
@@ -3,7 +3,7 @@ package notify
 import (
 	"context"
 
-	"tangled.sh/tangled.sh/core/appview/db"
+	"tangled.org/core/appview/db"
 )
 
 type mergedNotifier struct {
diff --git a/appview/notify/notifier.go b/appview/notify/notifier.go
index eb24f157..01e8ea51 100644
--- a/appview/notify/notifier.go
+++ b/appview/notify/notifier.go
@@ -3,7 +3,7 @@ package notify
 import (
 	"context"
 
-	"tangled.sh/tangled.sh/core/appview/db"
+	"tangled.org/core/appview/db"
 )
 
 type Notifier interface {
diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go
index b366ba1b..c5efa7e3 100644
--- a/appview/oauth/handler/handler.go
+++ b/appview/oauth/handler/handler.go
@@ -16,18 +16,18 @@ import (
 	"github.com/gorilla/sessions"
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/posthog/posthog-go"
+	tangled "tangled.org/core/api/tangled"
+	sessioncache "tangled.org/core/appview/cache/session"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/middleware"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/oauth/client"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 	"tangled.sh/icyphox.sh/atproto-oauth/helpers"
-	tangled "tangled.sh/tangled.sh/core/api/tangled"
-	sessioncache "tangled.sh/tangled.sh/core/appview/cache/session"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/oauth/client"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
 )
 
 const (
diff --git a/appview/oauth/oauth.go b/appview/oauth/oauth.go
index 8387c58d..9bf0021c 100644
--- a/appview/oauth/oauth.go
+++ b/appview/oauth/oauth.go
@@ -9,12 +9,12 @@ import (
 
 	indigo_xrpc "github.com/bluesky-social/indigo/xrpc"
 	"github.com/gorilla/sessions"
+	sessioncache "tangled.org/core/appview/cache/session"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/oauth/client"
+	xrpc "tangled.org/core/appview/xrpcclient"
 	oauth "tangled.sh/icyphox.sh/atproto-oauth"
 	"tangled.sh/icyphox.sh/atproto-oauth/helpers"
-	sessioncache "tangled.sh/tangled.sh/core/appview/cache/session"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/oauth/client"
-	xrpc "tangled.sh/tangled.sh/core/appview/xrpcclient"
 )
 
 type OAuth struct {
diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index 10cac92b..e87da0b9 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/go-enry/go-enry/v2"
-	"tangled.sh/tangled.sh/core/appview/filetree"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/crypto"
+	"tangled.org/core/appview/filetree"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/crypto"
 )
 
 func (p *Pages) funcMap() template.FuncMap {
diff --git a/appview/pages/markup/markdown.go b/appview/pages/markup/markdown.go
index e2152b19..3cbe3659 100644
--- a/appview/pages/markup/markdown.go
+++ b/appview/pages/markup/markdown.go
@@ -22,8 +22,8 @@ import (
 	"github.com/yuin/goldmark/util"
 	htmlparse "golang.org/x/net/html"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/pages/repoinfo"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/pages/repoinfo"
 )
 
 // RendererType defines the type of renderer to use based on context
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index e9f9fcf0..9ccbb00c 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -16,17 +16,17 @@ import (
 	"strings"
 	"sync"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/commitverify"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/appview/pages/repoinfo"
-	"tangled.sh/tangled.sh/core/appview/pagination"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/commitverify"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/appview/pages/repoinfo"
+	"tangled.org/core/appview/pagination"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/types"
 
 	"github.com/alecthomas/chroma/v2"
 	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"
diff --git a/appview/pages/repoinfo/repoinfo.go b/appview/pages/repoinfo/repoinfo.go
index c676ddbf..223bf72b 100644
--- a/appview/pages/repoinfo/repoinfo.go
+++ b/appview/pages/repoinfo/repoinfo.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/state/userutil"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/state/userutil"
 )
 
 func (r RepoInfo) OwnerWithAt() string {
diff --git a/appview/pages/templates/repo/fragments/cloneDropdown.html b/appview/pages/templates/repo/fragments/cloneDropdown.html
index 6a225a8e..e093fd56 100644
--- a/appview/pages/templates/repo/fragments/cloneDropdown.html
+++ b/appview/pages/templates/repo/fragments/cloneDropdown.html
@@ -29,8 +29,8 @@
                         <code
                             class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto"
                             onclick="window.getSelection().selectAllChildren(this)"
-                            data-url="https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}"
-                        >https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
+                            data-url="https://tangled.org/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}"
+                        >https://tangled.org/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
                         <button
                             onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))"
                             class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600"
diff --git a/appview/pipelines/pipelines.go b/appview/pipelines/pipelines.go
index c15d5270..61f2607c 100644
--- a/appview/pipelines/pipelines.go
+++ b/appview/pipelines/pipelines.go
@@ -9,16 +9,16 @@ import (
 	"strings"
 	"time"
 
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/rbac"
-	spindlemodel "tangled.sh/tangled.sh/core/spindle/models"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/log"
+	"tangled.org/core/rbac"
+	spindlemodel "tangled.org/core/spindle/models"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/websocket"
diff --git a/appview/pipelines/router.go b/appview/pipelines/router.go
index a54e7117..f55a7921 100644
--- a/appview/pipelines/router.go
+++ b/appview/pipelines/router.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/middleware"
+	"tangled.org/core/appview/middleware"
 )
 
 func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler {
diff --git a/appview/posthog/notifier.go b/appview/posthog/notifier.go
index db0c2cd0..732fcbdb 100644
--- a/appview/posthog/notifier.go
+++ b/appview/posthog/notifier.go
@@ -5,8 +5,8 @@ import (
 	"log"
 
 	"github.com/posthog/posthog-go"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/notify"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/notify"
 )
 
 type posthogNotifier struct {
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index c7e9b366..62937075 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -12,19 +12,19 @@ import (
 	"strings"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/notify"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/tid"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/notify"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/tid"
+	"tangled.org/core/types"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
diff --git a/appview/pulls/router.go b/appview/pulls/router.go
index 2e287354..caa37553 100644
--- a/appview/pulls/router.go
+++ b/appview/pulls/router.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/middleware"
+	"tangled.org/core/appview/middleware"
 )
 
 func (s *Pulls) Router(mw *middleware.Middleware) http.Handler {
diff --git a/appview/repo/artifact.go b/appview/repo/artifact.go
index a16dad7d..87344695 100644
--- a/appview/repo/artifact.go
+++ b/appview/repo/artifact.go
@@ -16,13 +16,13 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/ipfs/go-cid"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/tid"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/tid"
+	"tangled.org/core/types"
 )
 
 // TODO: proper statuses here on early exit
diff --git a/appview/repo/feed.go b/appview/repo/feed.go
index d4e99854..ab544b7d 100644
--- a/appview/repo/feed.go
+++ b/appview/repo/feed.go
@@ -8,9 +8,9 @@ import (
 	"slices"
 	"time"
 
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pagination"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pagination"
+	"tangled.org/core/appview/reporesolver"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/gorilla/feeds"
diff --git a/appview/repo/index.go b/appview/repo/index.go
index aafb8e1a..31750259 100644
--- a/appview/repo/index.go
+++ b/appview/repo/index.go
@@ -17,14 +17,14 @@ import (
 
 	indigoxrpc "github.com/bluesky-social/indigo/xrpc"
 	"github.com/go-git/go-git/v5/plumbing"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/commitverify"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/commitverify"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/types"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-enry/go-enry/v2"
diff --git a/appview/repo/repo.go b/appview/repo/repo.go
index 3e8953b8..cca92686 100644
--- a/appview/repo/repo.go
+++ b/appview/repo/repo.go
@@ -20,23 +20,23 @@ import (
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	indigoxrpc "github.com/bluesky-social/indigo/xrpc"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/commitverify"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/notify"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	xrpcclient "tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
-	"tangled.sh/tangled.sh/core/types"
-	"tangled.sh/tangled.sh/core/xrpc/serviceauth"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/commitverify"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/notify"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/appview/reporesolver"
+	xrpcclient "tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
+	"tangled.org/core/types"
+	"tangled.org/core/xrpc/serviceauth"
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/go-chi/chi/v5"
diff --git a/appview/repo/repo_util.go b/appview/repo/repo_util.go
index f562f725..d04bacec 100644
--- a/appview/repo/repo_util.go
+++ b/appview/repo/repo_util.go
@@ -9,9 +9,9 @@ import (
 	"sort"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages/repoinfo"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages/repoinfo"
+	"tangled.org/core/types"
 
 	"github.com/go-git/go-git/v5/plumbing/object"
 )
diff --git a/appview/repo/router.go b/appview/repo/router.go
index bc017462..9a9aab09 100644
--- a/appview/repo/router.go
+++ b/appview/repo/router.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/middleware"
+	"tangled.org/core/appview/middleware"
 )
 
 func (rp *Repo) Router(mw *middleware.Middleware) http.Handler {
diff --git a/appview/reporesolver/resolver.go b/appview/reporesolver/resolver.go
index 35622526..a4d65f96 100644
--- a/appview/reporesolver/resolver.go
+++ b/appview/reporesolver/resolver.go
@@ -14,13 +14,13 @@ import (
 	"github.com/bluesky-social/indigo/atproto/identity"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pages/repoinfo"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/repoinfo"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
 )
 
 type ResolvedRepo struct {
diff --git a/appview/serververify/verify.go b/appview/serververify/verify.go
index 6b47f15c..dbe93420 100644
--- a/appview/serververify/verify.go
+++ b/appview/serververify/verify.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 
 	indigoxrpc "github.com/bluesky-social/indigo/xrpc"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/rbac"
 )
 
 var (
diff --git a/appview/settings/settings.go b/appview/settings/settings.go
index acc1cf68..c2104222 100644
--- a/appview/settings/settings.go
+++ b/appview/settings/settings.go
@@ -11,14 +11,14 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/email"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/email"
+	"tangled.org/core/appview/middleware"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/tid"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
@@ -246,7 +246,7 @@ func (s *Settings) verifyUrl(did string, email string, code string) string {
 	if s.Config.Core.Dev {
 		appUrl = "http://" + s.Config.Core.ListenAddr
 	} else {
-		appUrl = "https://tangled.sh"
+		appUrl = s.Config.Core.AppviewHost
 	}
 
 	return fmt.Sprintf("%s/settings/emails/verify?did=%s&email=%s&code=%s", appUrl, url.QueryEscape(did), url.QueryEscape(email), url.QueryEscape(code))
diff --git a/appview/signup/signup.go b/appview/signup/signup.go
index c720818d..deace4af 100644
--- a/appview/signup/signup.go
+++ b/appview/signup/signup.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/posthog/posthog-go"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/dns"
-	"tangled.sh/tangled.sh/core/appview/email"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/state/userutil"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/idresolver"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/dns"
+	"tangled.org/core/appview/email"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/state/userutil"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/idresolver"
 )
 
 type Signup struct {
diff --git a/appview/spindles/spindles.go b/appview/spindles/spindles.go
index ebd09947..d175c092 100644
--- a/appview/spindles/spindles.go
+++ b/appview/spindles/spindles.go
@@ -9,17 +9,17 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/serververify"
-	"tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/middleware"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/serververify"
+	"tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/atproto/syntax"
diff --git a/appview/state/follow.go b/appview/state/follow.go
index aa611781..597374ee 100644
--- a/appview/state/follow.go
+++ b/appview/state/follow.go
@@ -7,10 +7,10 @@ import (
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/tid"
 )
 
 func (s *State) Follow(w http.ResponseWriter, r *http.Request) {
diff --git a/appview/state/git_http.go b/appview/state/git_http.go
index bf7f7bb3..e1959505 100644
--- a/appview/state/git_http.go
+++ b/appview/state/git_http.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/appview/db"
+	"tangled.org/core/appview/db"
 )
 
 func (s *State) InfoRefs(w http.ResponseWriter, r *http.Request) {
diff --git a/appview/state/knotstream.go b/appview/state/knotstream.go
index bc99635f..0fab4a0c 100644
--- a/appview/state/knotstream.go
+++ b/appview/state/knotstream.go
@@ -8,15 +8,15 @@ import (
 	"slices"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/cache"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	ec "tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/eventconsumer/cursor"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/workflow"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/cache"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	ec "tangled.org/core/eventconsumer"
+	"tangled.org/core/eventconsumer/cursor"
+	"tangled.org/core/log"
+	"tangled.org/core/rbac"
+	"tangled.org/core/workflow"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/go-git/go-git/v5/plumbing"
diff --git a/appview/state/profile.go b/appview/state/profile.go
index 4a23b172..479389ea 100644
--- a/appview/state/profile.go
+++ b/appview/state/profile.go
@@ -15,9 +15,9 @@ import (
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/feeds"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
 )
 
 func (s *State) Profile(w http.ResponseWriter, r *http.Request) {
diff --git a/appview/state/reaction.go b/appview/state/reaction.go
index e6c751ad..03caac7a 100644
--- a/appview/state/reaction.go
+++ b/appview/state/reaction.go
@@ -9,10 +9,10 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 
 	lexutil "github.com/bluesky-social/indigo/lex/util"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/tid"
 )
 
 func (s *State) React(w http.ResponseWriter, r *http.Request) {
diff --git a/appview/state/router.go b/appview/state/router.go
index 493874e6..0af0d420 100644
--- a/appview/state/router.go
+++ b/appview/state/router.go
@@ -6,19 +6,19 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/sessions"
-	"tangled.sh/tangled.sh/core/appview/issues"
-	"tangled.sh/tangled.sh/core/appview/knots"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	oauthhandler "tangled.sh/tangled.sh/core/appview/oauth/handler"
-	"tangled.sh/tangled.sh/core/appview/pipelines"
-	"tangled.sh/tangled.sh/core/appview/pulls"
-	"tangled.sh/tangled.sh/core/appview/repo"
-	"tangled.sh/tangled.sh/core/appview/settings"
-	"tangled.sh/tangled.sh/core/appview/signup"
-	"tangled.sh/tangled.sh/core/appview/spindles"
-	"tangled.sh/tangled.sh/core/appview/state/userutil"
-	avstrings "tangled.sh/tangled.sh/core/appview/strings"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/appview/issues"
+	"tangled.org/core/appview/knots"
+	"tangled.org/core/appview/middleware"
+	oauthhandler "tangled.org/core/appview/oauth/handler"
+	"tangled.org/core/appview/pipelines"
+	"tangled.org/core/appview/pulls"
+	"tangled.org/core/appview/repo"
+	"tangled.org/core/appview/settings"
+	"tangled.org/core/appview/signup"
+	"tangled.org/core/appview/spindles"
+	"tangled.org/core/appview/state/userutil"
+	avstrings "tangled.org/core/appview/strings"
+	"tangled.org/core/log"
 )
 
 func (s *State) Router() http.Handler {
@@ -115,6 +115,9 @@ func (s *State) StandardRouter(mw *middleware.Middleware) http.Handler {
 	r.Get("/timeline", s.Timeline)
 	r.With(middleware.AuthMiddleware(s.oauth)).Get("/upgradeBanner", s.UpgradeBanner)
 
+	// special-case handler for serving tangled.org/core
+	r.Get("/core", s.Core())
+
 	r.Route("/repo", func(r chi.Router) {
 		r.Route("/new", func(r chi.Router) {
 			r.Use(middleware.AuthMiddleware(s.oauth))
@@ -164,6 +167,20 @@ func (s *State) StandardRouter(mw *middleware.Middleware) http.Handler {
 	return r
 }
 
+// Core serves tangled.org/core go-import meta tags, and redirects
+// to the core repository if accessed normally.
+func (s *State) Core() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Query().Get("go-get") == "1" {
+			w.Header().Set("Content-Type", "text/html")
+			w.Write([]byte(`<meta name="go-import" content="tangled.org/core git https://tangled.org/tangled.org/core">`))
+			return
+		}
+
+		http.Redirect(w, r, "/@tangled.org/core", http.StatusFound)
+	}
+}
+
 func (s *State) OAuthRouter() http.Handler {
 	store := sessions.NewCookieStore([]byte(s.config.Core.CookieSecret))
 	oauth := oauthhandler.New(s.config, s.pages, s.idResolver, s.db, s.sess, store, s.oauth, s.enforcer, s.posthog)
diff --git a/appview/state/spindlestream.go b/appview/state/spindlestream.go
index 1e984253..76ac3d1f 100644
--- a/appview/state/spindlestream.go
+++ b/appview/state/spindlestream.go
@@ -9,15 +9,15 @@ import (
 	"time"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/cache"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	ec "tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/eventconsumer/cursor"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/rbac"
-	spindle "tangled.sh/tangled.sh/core/spindle/models"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/cache"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	ec "tangled.org/core/eventconsumer"
+	"tangled.org/core/eventconsumer/cursor"
+	"tangled.org/core/log"
+	"tangled.org/core/rbac"
+	spindle "tangled.org/core/spindle/models"
 )
 
 func Spindlestream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rbac.Enforcer) (*ec.Consumer, error) {
diff --git a/appview/state/star.go b/appview/state/star.go
index 2a956aa0..99872760 100644
--- a/appview/state/star.go
+++ b/appview/state/star.go
@@ -8,10 +8,10 @@ import (
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/tid"
 )
 
 func (s *State) Star(w http.ResponseWriter, r *http.Request) {
diff --git a/appview/state/state.go b/appview/state/state.go
index 307a7315..704bf814 100644
--- a/appview/state/state.go
+++ b/appview/state/state.go
@@ -17,26 +17,26 @@ import (
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/go-chi/chi/v5"
 	"github.com/posthog/posthog-go"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview"
-	"tangled.sh/tangled.sh/core/appview/cache"
-	"tangled.sh/tangled.sh/core/appview/cache/session"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/notify"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	posthogService "tangled.sh/tangled.sh/core/appview/posthog"
-	"tangled.sh/tangled.sh/core/appview/reporesolver"
-	"tangled.sh/tangled.sh/core/appview/validator"
-	xrpcclient "tangled.sh/tangled.sh/core/appview/xrpcclient"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/jetstream"
-	tlog "tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
-	// xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview"
+	"tangled.org/core/appview/cache"
+	"tangled.org/core/appview/cache/session"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/notify"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	posthogService "tangled.org/core/appview/posthog"
+	"tangled.org/core/appview/reporesolver"
+	"tangled.org/core/appview/validator"
+	xrpcclient "tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/jetstream"
+	tlog "tangled.org/core/log"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
+	// xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 type State struct {
diff --git a/appview/strings/strings.go b/appview/strings/strings.go
index f1e4267c..265254b9 100644
--- a/appview/strings/strings.go
+++ b/appview/strings/strings.go
@@ -8,18 +8,18 @@ import (
 	"strconv"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/middleware"
-	"tangled.sh/tangled.sh/core/appview/notify"
-	"tangled.sh/tangled.sh/core/appview/oauth"
-	"tangled.sh/tangled.sh/core/appview/pages"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/middleware"
+	"tangled.org/core/appview/notify"
+	"tangled.org/core/appview/oauth"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/markup"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/tid"
 
 	"github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/atproto/identity"
diff --git a/appview/validator/issue.go b/appview/validator/issue.go
index 7744e1df..6dff0d55 100644
--- a/appview/validator/issue.go
+++ b/appview/validator/issue.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/appview/db"
+	"tangled.org/core/appview/db"
 )
 
 func (v *Validator) ValidateIssueComment(comment *db.IssueComment) error {
diff --git a/appview/validator/validator.go b/appview/validator/validator.go
index 0f10bf89..ed1a7a35 100644
--- a/appview/validator/validator.go
+++ b/appview/validator/validator.go
@@ -1,8 +1,8 @@
 package validator
 
 import (
-	"tangled.sh/tangled.sh/core/appview/db"
-	"tangled.sh/tangled.sh/core/appview/pages/markup"
+	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/pages/markup"
 )
 
 type Validator struct {
diff --git a/cmd/appview/main.go b/cmd/appview/main.go
index 04e96382..47359823 100644
--- a/cmd/appview/main.go
+++ b/cmd/appview/main.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"os"
 
-	"tangled.sh/tangled.sh/core/appview/config"
-	"tangled.sh/tangled.sh/core/appview/state"
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/state"
 )
 
 func main() {
diff --git a/cmd/combinediff/main.go b/cmd/combinediff/main.go
index 6f5d7ab8..81827136 100644
--- a/cmd/combinediff/main.go
+++ b/cmd/combinediff/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
-	"tangled.sh/tangled.sh/core/patchutil"
+	"tangled.org/core/patchutil"
 )
 
 func main() {
diff --git a/cmd/gen.go b/cmd/gen.go
index dc0a270c..52a314ee 100644
--- a/cmd/gen.go
+++ b/cmd/gen.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 func main() {
diff --git a/cmd/interdiff/main.go b/cmd/interdiff/main.go
index 6ed26cef..490891ff 100644
--- a/cmd/interdiff/main.go
+++ b/cmd/interdiff/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
-	"tangled.sh/tangled.sh/core/patchutil"
+	"tangled.org/core/patchutil"
 )
 
 func main() {
diff --git a/cmd/knot/main.go b/cmd/knot/main.go
index 17ca5ec4..615466e0 100644
--- a/cmd/knot/main.go
+++ b/cmd/knot/main.go
@@ -5,11 +5,11 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v3"
-	"tangled.sh/tangled.sh/core/guard"
-	"tangled.sh/tangled.sh/core/hook"
-	"tangled.sh/tangled.sh/core/keyfetch"
-	"tangled.sh/tangled.sh/core/knotserver"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/guard"
+	"tangled.org/core/hook"
+	"tangled.org/core/keyfetch"
+	"tangled.org/core/knotserver"
+	"tangled.org/core/log"
 )
 
 func main() {
diff --git a/cmd/spindle/main.go b/cmd/spindle/main.go
index 9dced265..95d6ce33 100644
--- a/cmd/spindle/main.go
+++ b/cmd/spindle/main.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/spindle"
-	_ "tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/log"
+	"tangled.org/core/spindle"
+	_ "tangled.org/core/tid"
 )
 
 func main() {
diff --git a/cmd/verifysig/main.go b/cmd/verifysig/main.go
index 5d486818..b0e26b04 100644
--- a/cmd/verifysig/main.go
+++ b/cmd/verifysig/main.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/crypto"
+	"tangled.org/core/crypto"
 )
 
 func parseCommitObject(commitData string) (string, string, error) {
diff --git a/crypto/verify.go b/crypto/verify.go
index 5a9c5ded..a87b2888 100644
--- a/crypto/verify.go
+++ b/crypto/verify.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hiddeco/sshsig"
 	"golang.org/x/crypto/ssh"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/types"
 )
 
 func VerifySignature(pubKey, signature, payload []byte) (error, bool) {
diff --git a/docs/knot-hosting.md b/docs/knot-hosting.md
index b6a5f219..ee3f635c 100644
--- a/docs/knot-hosting.md
+++ b/docs/knot-hosting.md
@@ -19,7 +19,7 @@ There's a couple of ways to get started:
 First, clone this repository:
 
 ```
-git clone https://tangled.sh/@tangled.sh/core
+git clone https://tangled.org/@tangled.org/core
 ```
 
 Then, build the `knot` CLI. This is the knot administration and operation tool.
@@ -130,7 +130,7 @@ knot domain.
 
 You should now have a running knot server! You can finalize
 your registration by hitting the `verify` button on the
-[/knots](https://tangled.sh/knots) page. This simply creates
+[/knots](https://tangled.org/knots) page. This simply creates
 a record on your PDS to announce the existence of the knot.
 
 ### custom paths
diff --git a/docs/migrations.md b/docs/migrations.md
index 99e36641..fc726e29 100644
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -14,14 +14,14 @@ straightforward however.
 For knots:
 
 - Upgrade to latest tag (v1.9.0 or above)
-- Head to the [knot dashboard](https://tangled.sh/knots) and
+- Head to the [knot dashboard](https://tangled.org/knots) and
   hit the "retry" button to verify your knot
 
 For spindles:
 
 - Upgrade to latest tag (v1.9.0 or above)
 - Head to the [spindle
-  dashboard](https://tangled.sh/spindles) and hit the
+  dashboard](https://tangled.org/spindles) and hit the
   "retry" button to verify your spindle
 
 ## Upgrading from v1.7.x
@@ -38,10 +38,10 @@ Upgrading is quite easy, in essence:
   environment variable entirely
 - `KNOT_SERVER_OWNER` is now required on boot, set this to
   your DID. You can find your DID in the
-  [settings](https://tangled.sh/settings) page.
+  [settings](https://tangled.org/settings) page.
 - Restart your knot once you have replaced the environment
   variable
-- Head to the [knot dashboard](https://tangled.sh/knots) and
+- Head to the [knot dashboard](https://tangled.org/knots) and
   hit the "retry" button to verify your knot. This simply
   writes a `sh.tangled.knot` record to your PDS.
 
@@ -57,4 +57,3 @@ latest revision, and change your config block like so:
    };
  };
 ```
-
diff --git a/docs/spindle/openbao.md b/docs/spindle/openbao.md
index 88c7aca7..b91c15c5 100644
--- a/docs/spindle/openbao.md
+++ b/docs/spindle/openbao.md
@@ -44,7 +44,7 @@ export BAO_TOKEN=root
 ### production
 
 You would typically use a systemd service with a configuration file. Refer to
-[@tangled.sh/infra](https://tangled.sh/@tangled.sh/infra) for how this can be
+[@tangled.org/infra](https://tangled.org/@tangled.org/infra) for how this can be
 achieved using Nix.
 
 Then, initialize the bao server:
diff --git a/docs/spindle/pipeline.md b/docs/spindle/pipeline.md
index e4bb62b0..d57f253c 100644
--- a/docs/spindle/pipeline.md
+++ b/docs/spindle/pipeline.md
@@ -73,7 +73,7 @@ dependencies:
     - nodejs
     - go
   # custom registry
-  git+https://tangled.sh/@example.com/my_pkg:
+  git+https://tangled.org/@example.com/my_pkg:
     - my_pkg
 ```
 
@@ -141,7 +141,7 @@ dependencies:
     - nodejs
     - go
   # custom registry
-  git+https://tangled.sh/@example.com/my_pkg:
+  git+https://tangled.org/@example.com/my_pkg:
     - my_pkg
 
 environment:
diff --git a/eventconsumer/consumer.go b/eventconsumer/consumer.go
index 1d87a3cb..0a6e3cae 100644
--- a/eventconsumer/consumer.go
+++ b/eventconsumer/consumer.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"tangled.sh/tangled.sh/core/eventconsumer/cursor"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/eventconsumer/cursor"
+	"tangled.org/core/log"
 
 	"github.com/avast/retry-go/v4"
 	"github.com/gorilla/websocket"
diff --git a/eventconsumer/cursor/redis.go b/eventconsumer/cursor/redis.go
index 88da382c..9deb16cb 100644
--- a/eventconsumer/cursor/redis.go
+++ b/eventconsumer/cursor/redis.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"tangled.sh/tangled.sh/core/appview/cache"
+	"tangled.org/core/appview/cache"
 )
 
 const (
diff --git a/go.mod b/go.mod
index b59ada7d..a9500fb1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module tangled.sh/tangled.sh/core
+module tangled.org/core
 
 go 1.24.4
 
diff --git a/guard/guard.go b/guard/guard.go
index 9e6ff6b6..cb8c86fe 100644
--- a/guard/guard.go
+++ b/guard/guard.go
@@ -15,8 +15,8 @@ import (
 	"github.com/bluesky-social/indigo/atproto/identity"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/urfave/cli/v3"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/log"
 )
 
 func Command() *cli.Command {
diff --git a/jetstream/jetstream.go b/jetstream/jetstream.go
index e2935f69..4948c3f0 100644
--- a/jetstream/jetstream.go
+++ b/jetstream/jetstream.go
@@ -13,7 +13,7 @@ import (
 	"github.com/bluesky-social/jetstream/pkg/client"
 	"github.com/bluesky-social/jetstream/pkg/client/schedulers/sequential"
 	"github.com/bluesky-social/jetstream/pkg/models"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/log"
 )
 
 type DB interface {
diff --git a/keyfetch/keyfetch.go b/keyfetch/keyfetch.go
index 6e7e4bc0..9eb6495f 100644
--- a/keyfetch/keyfetch.go
+++ b/keyfetch/keyfetch.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/urfave/cli/v3"
-	"tangled.sh/tangled.sh/core/log"
+	"tangled.org/core/log"
 )
 
 func Command() *cli.Command {
diff --git a/knotserver/db/events.go b/knotserver/db/events.go
index 4c9d06f7..9b154aae 100644
--- a/knotserver/db/events.go
+++ b/knotserver/db/events.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"tangled.sh/tangled.sh/core/notifier"
+	"tangled.org/core/notifier"
 )
 
 type Event struct {
diff --git a/knotserver/db/pubkeys.go b/knotserver/db/pubkeys.go
index 3d6a18f9..5e4a187c 100644
--- a/knotserver/db/pubkeys.go
+++ b/knotserver/db/pubkeys.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type PublicKey struct {
diff --git a/knotserver/git.go b/knotserver/git.go
index 1cd68a58..0258239c 100644
--- a/knotserver/git.go
+++ b/knotserver/git.go
@@ -10,7 +10,7 @@ import (
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/knotserver/git/service"
+	"tangled.org/core/knotserver/git/service"
 )
 
 func (d *Knot) InfoRefs(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/git/branch.go b/knotserver/git/branch.go
index e1cd2b84..5e00a847 100644
--- a/knotserver/git/branch.go
+++ b/knotserver/git/branch.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/types"
 )
 
 func (g *GitRepo) Branches() ([]types.Branch, error) {
diff --git a/knotserver/git/diff.go b/knotserver/git/diff.go
index 8232ba61..6f538fce 100644
--- a/knotserver/git/diff.go
+++ b/knotserver/git/diff.go
@@ -12,8 +12,8 @@ import (
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/types"
 )
 
 func (g *GitRepo) Diff() (*types.NiceDiff, error) {
diff --git a/knotserver/git/post_receive.go b/knotserver/git/post_receive.go
index caeec2e1..74eef295 100644
--- a/knotserver/git/post_receive.go
+++ b/knotserver/git/post_receive.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 
 	"github.com/go-git/go-git/v5/plumbing"
 )
diff --git a/knotserver/git/tree.go b/knotserver/git/tree.go
index d246920b..6ba0bf8a 100644
--- a/knotserver/git/tree.go
+++ b/knotserver/git/tree.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/types"
 )
 
 func (g *GitRepo) FileTree(ctx context.Context, path string) ([]types.NiceTree, error) {
diff --git a/knotserver/ingester.go b/knotserver/ingester.go
index 696f5601..accc2bbe 100644
--- a/knotserver/ingester.go
+++ b/knotserver/ingester.go
@@ -15,13 +15,13 @@ import (
 	"github.com/bluesky-social/indigo/xrpc"
 	"github.com/bluesky-social/jetstream/pkg/models"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/knotserver/db"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/workflow"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/knotserver/db"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/log"
+	"tangled.org/core/rbac"
+	"tangled.org/core/workflow"
 )
 
 func (h *Knot) processPublicKey(ctx context.Context, event *models.Event) error {
diff --git a/knotserver/internal.go b/knotserver/internal.go
index b88584b8..fb70c318 100644
--- a/knotserver/internal.go
+++ b/knotserver/internal.go
@@ -13,14 +13,14 @@ import (
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/hook"
-	"tangled.sh/tangled.sh/core/knotserver/config"
-	"tangled.sh/tangled.sh/core/knotserver/db"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/workflow"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/hook"
+	"tangled.org/core/knotserver/config"
+	"tangled.org/core/knotserver/db"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/notifier"
+	"tangled.org/core/rbac"
+	"tangled.org/core/workflow"
 )
 
 type InternalHandle struct {
diff --git a/knotserver/router.go b/knotserver/router.go
index b7772960..53e01659 100644
--- a/knotserver/router.go
+++ b/knotserver/router.go
@@ -7,15 +7,15 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/jetstream"
-	"tangled.sh/tangled.sh/core/knotserver/config"
-	"tangled.sh/tangled.sh/core/knotserver/db"
-	"tangled.sh/tangled.sh/core/knotserver/xrpc"
-	tlog "tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/xrpc/serviceauth"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/jetstream"
+	"tangled.org/core/knotserver/config"
+	"tangled.org/core/knotserver/db"
+	"tangled.org/core/knotserver/xrpc"
+	tlog "tangled.org/core/log"
+	"tangled.org/core/notifier"
+	"tangled.org/core/rbac"
+	"tangled.org/core/xrpc/serviceauth"
 )
 
 type Knot struct {
diff --git a/knotserver/server.go b/knotserver/server.go
index 9bec1fd6..98c259bd 100644
--- a/knotserver/server.go
+++ b/knotserver/server.go
@@ -6,14 +6,14 @@ import (
 	"net/http"
 
 	"github.com/urfave/cli/v3"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/hook"
-	"tangled.sh/tangled.sh/core/jetstream"
-	"tangled.sh/tangled.sh/core/knotserver/config"
-	"tangled.sh/tangled.sh/core/knotserver/db"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/hook"
+	"tangled.org/core/jetstream"
+	"tangled.org/core/knotserver/config"
+	"tangled.org/core/knotserver/db"
+	"tangled.org/core/log"
+	"tangled.org/core/notifier"
+	"tangled.org/core/rbac"
 )
 
 func Command() *cli.Command {
diff --git a/knotserver/xrpc/create_repo.go b/knotserver/xrpc/create_repo.go
index 6779b817..b35c72bd 100644
--- a/knotserver/xrpc/create_repo.go
+++ b/knotserver/xrpc/create_repo.go
@@ -13,11 +13,11 @@ import (
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	gogit "github.com/go-git/go-git/v5"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/hook"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/rbac"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/hook"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/rbac"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (h *Xrpc) CreateRepo(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/delete_repo.go b/knotserver/xrpc/delete_repo.go
index ee62d183..94734f0e 100644
--- a/knotserver/xrpc/delete_repo.go
+++ b/knotserver/xrpc/delete_repo.go
@@ -11,9 +11,9 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/rbac"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/rbac"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) DeleteRepo(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/fork_status.go b/knotserver/xrpc/fork_status.go
index 80827447..e4a21f49 100644
--- a/knotserver/xrpc/fork_status.go
+++ b/knotserver/xrpc/fork_status.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/rbac"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) ForkStatus(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/fork_sync.go b/knotserver/xrpc/fork_sync.go
index aa6cecf7..1f034d94 100644
--- a/knotserver/xrpc/fork_sync.go
+++ b/knotserver/xrpc/fork_sync.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/rbac"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/rbac"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) ForkSync(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/hidden_ref.go b/knotserver/xrpc/hidden_ref.go
index 96267d75..16deae71 100644
--- a/knotserver/xrpc/hidden_ref.go
+++ b/knotserver/xrpc/hidden_ref.go
@@ -9,10 +9,10 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/rbac"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/rbac"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) HiddenRef(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/list_keys.go b/knotserver/xrpc/list_keys.go
index 531f3cc7..d3353943 100644
--- a/knotserver/xrpc/list_keys.go
+++ b/knotserver/xrpc/list_keys.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) ListKeys(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/merge.go b/knotserver/xrpc/merge.go
index 03b71c3e..b3fb2687 100644
--- a/knotserver/xrpc/merge.go
+++ b/knotserver/xrpc/merge.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/patchutil"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/rbac"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) Merge(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/merge_check.go b/knotserver/xrpc/merge_check.go
index c49f4761..2994e92b 100644
--- a/knotserver/xrpc/merge_check.go
+++ b/knotserver/xrpc/merge_check.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) MergeCheck(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/owner.go b/knotserver/xrpc/owner.go
index 5d34cb85..b4bbf99c 100644
--- a/knotserver/xrpc/owner.go
+++ b/knotserver/xrpc/owner.go
@@ -3,8 +3,8 @@ package xrpc
 import (
 	"net/http"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_archive.go b/knotserver/xrpc/repo_archive.go
index f0a87547..42fe498e 100644
--- a/knotserver/xrpc/repo_archive.go
+++ b/knotserver/xrpc/repo_archive.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoArchive(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_blob.go b/knotserver/xrpc/repo_blob.go
index 14aa8966..2b8b2996 100644
--- a/knotserver/xrpc/repo_blob.go
+++ b/knotserver/xrpc/repo_blob.go
@@ -9,9 +9,9 @@ import (
 	"slices"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoBlob(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_branch.go b/knotserver/xrpc/repo_branch.go
index 13009ac3..7a5273fc 100644
--- a/knotserver/xrpc/repo_branch.go
+++ b/knotserver/xrpc/repo_branch.go
@@ -5,9 +5,9 @@ import (
 	"net/url"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoBranch(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_branches.go b/knotserver/xrpc/repo_branches.go
index a845a54a..4a44e114 100644
--- a/knotserver/xrpc/repo_branches.go
+++ b/knotserver/xrpc/repo_branches.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoBranches(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_compare.go b/knotserver/xrpc/repo_compare.go
index 129de4a9..6147e5f9 100644
--- a/knotserver/xrpc/repo_compare.go
+++ b/knotserver/xrpc/repo_compare.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoCompare(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_diff.go b/knotserver/xrpc/repo_diff.go
index c5ed8ce1..84fed659 100644
--- a/knotserver/xrpc/repo_diff.go
+++ b/knotserver/xrpc/repo_diff.go
@@ -3,9 +3,9 @@ package xrpc
 import (
 	"net/http"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoDiff(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_get_default_branch.go b/knotserver/xrpc/repo_get_default_branch.go
index cbe5e8af..74e6f2cc 100644
--- a/knotserver/xrpc/repo_get_default_branch.go
+++ b/knotserver/xrpc/repo_get_default_branch.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoGetDefaultBranch(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_languages.go b/knotserver/xrpc/repo_languages.go
index 2028d365..ffc8681c 100644
--- a/knotserver/xrpc/repo_languages.go
+++ b/knotserver/xrpc/repo_languages.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoLanguages(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_log.go b/knotserver/xrpc/repo_log.go
index 9e9492be..da182148 100644
--- a/knotserver/xrpc/repo_log.go
+++ b/knotserver/xrpc/repo_log.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoLog(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_tags.go b/knotserver/xrpc/repo_tags.go
index 3bedb5fe..af7c41c0 100644
--- a/knotserver/xrpc/repo_tags.go
+++ b/knotserver/xrpc/repo_tags.go
@@ -7,9 +7,9 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/types"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/types"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoTags(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/repo_tree.go b/knotserver/xrpc/repo_tree.go
index 1c301711..fa7819d9 100644
--- a/knotserver/xrpc/repo_tree.go
+++ b/knotserver/xrpc/repo_tree.go
@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RepoTree(w http.ResponseWriter, r *http.Request) {
diff --git a/knotserver/xrpc/set_default_branch.go b/knotserver/xrpc/set_default_branch.go
index 73ecaef5..dd6cc031 100644
--- a/knotserver/xrpc/set_default_branch.go
+++ b/knotserver/xrpc/set_default_branch.go
@@ -9,11 +9,11 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/knotserver/git"
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/knotserver/git"
+	"tangled.org/core/rbac"
 
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 const ActorDid string = "ActorDid"
diff --git a/knotserver/xrpc/version.go b/knotserver/xrpc/version.go
index f9b3fd7c..cbdcafef 100644
--- a/knotserver/xrpc/version.go
+++ b/knotserver/xrpc/version.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"runtime/debug"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 // version is set during build time.
@@ -24,7 +24,7 @@ func (x *Xrpc) Version(w http.ResponseWriter, r *http.Request) {
 		var modified bool
 
 		for _, mod := range info.Deps {
-			if mod.Path == "tangled.sh/tangled.sh/knotserver/xrpc" {
+			if mod.Path == "tangled.org/tangled.org/knotserver/xrpc" {
 				modVer = mod.Version
 				break
 			}
diff --git a/knotserver/xrpc/xrpc.go b/knotserver/xrpc/xrpc.go
index 78bb9a9d..03ee5301 100644
--- a/knotserver/xrpc/xrpc.go
+++ b/knotserver/xrpc/xrpc.go
@@ -7,15 +7,15 @@ import (
 	"strings"
 
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/jetstream"
-	"tangled.sh/tangled.sh/core/knotserver/config"
-	"tangled.sh/tangled.sh/core/knotserver/db"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/rbac"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
-	"tangled.sh/tangled.sh/core/xrpc/serviceauth"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/jetstream"
+	"tangled.org/core/knotserver/config"
+	"tangled.org/core/knotserver/db"
+	"tangled.org/core/notifier"
+	"tangled.org/core/rbac"
+	xrpcerr "tangled.org/core/xrpc/errors"
+	"tangled.org/core/xrpc/serviceauth"
 
 	"github.com/go-chi/chi/v5"
 )
diff --git a/lexicon-build-config.json b/lexicon-build-config.json
index 993cf825..47f1fea4 100644
--- a/lexicon-build-config.json
+++ b/lexicon-build-config.json
@@ -3,7 +3,7 @@
     "package": "tangled",
     "prefix": "sh.tangled",
     "outdir": "api/tangled",
-    "import": "tangled.sh/tangled.sh/core/api/tangled",
+    "import": "tangled.org/core/api/tangled",
     "gen-server": true
   }
 ]
diff --git a/nix/pkgs/knot-unwrapped.nix b/nix/pkgs/knot-unwrapped.nix
index 9a975dda..0656a0f5 100644
--- a/nix/pkgs/knot-unwrapped.nix
+++ b/nix/pkgs/knot-unwrapped.nix
@@ -16,7 +16,7 @@ in
     tags = ["libsqlite3"];
 
     ldflags = [
-      "-X tangled.sh/tangled.sh/core/knotserver/xrpc.version=${version}"
+      "-X tangled.org/core/knotserver/xrpc.version=${version}"
     ];
 
     env.CGO_CFLAGS = "-I ${sqlite-lib}/include ";
diff --git a/patchutil/interdiff.go b/patchutil/interdiff.go
index 3a9b5e70..8639e73d 100644
--- a/patchutil/interdiff.go
+++ b/patchutil/interdiff.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/types"
 )
 
 type InterdiffResult struct {
diff --git a/patchutil/patchutil.go b/patchutil/patchutil.go
index 6920f974..311693af 100644
--- a/patchutil/patchutil.go
+++ b/patchutil/patchutil.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
-	"tangled.sh/tangled.sh/core/types"
+	"tangled.org/core/types"
 )
 
 func ExtractPatches(formatPatch string) ([]types.FormatPatch, error) {
diff --git a/rbac/rbac_test.go b/rbac/rbac_test.go
index 4c7252ab..cd1d4198 100644
--- a/rbac/rbac_test.go
+++ b/rbac/rbac_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"tangled.sh/tangled.sh/core/rbac"
+	"tangled.org/core/rbac"
 
 	adapter "github.com/Blank-Xu/sql-adapter"
 	"github.com/casbin/casbin/v2"
diff --git a/spindle/db/events.go b/spindle/db/events.go
index 11d0a9f9..e37aee71 100644
--- a/spindle/db/events.go
+++ b/spindle/db/events.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/tid"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/notifier"
+	"tangled.org/core/spindle/models"
+	"tangled.org/core/tid"
 )
 
 type Event struct {
diff --git a/spindle/engine/engine.go b/spindle/engine/engine.go
index bc804a33..22072cc8 100644
--- a/spindle/engine/engine.go
+++ b/spindle/engine/engine.go
@@ -8,11 +8,11 @@ import (
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"golang.org/x/sync/errgroup"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/spindle/config"
-	"tangled.sh/tangled.sh/core/spindle/db"
-	"tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
+	"tangled.org/core/notifier"
+	"tangled.org/core/spindle/config"
+	"tangled.org/core/spindle/db"
+	"tangled.org/core/spindle/models"
+	"tangled.org/core/spindle/secrets"
 )
 
 var (
diff --git a/spindle/engines/nixery/engine.go b/spindle/engines/nixery/engine.go
index 73e26065..8fc8d785 100644
--- a/spindle/engines/nixery/engine.go
+++ b/spindle/engines/nixery/engine.go
@@ -19,12 +19,12 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
 	"gopkg.in/yaml.v3"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/spindle/config"
-	"tangled.sh/tangled.sh/core/spindle/engine"
-	"tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/log"
+	"tangled.org/core/spindle/config"
+	"tangled.org/core/spindle/engine"
+	"tangled.org/core/spindle/models"
+	"tangled.org/core/spindle/secrets"
 )
 
 const (
diff --git a/spindle/engines/nixery/setup_steps.go b/spindle/engines/nixery/setup_steps.go
index e74ef9af..03269488 100644
--- a/spindle/engines/nixery/setup_steps.go
+++ b/spindle/engines/nixery/setup_steps.go
@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/workflow"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/workflow"
 )
 
 func nixConfStep() Step {
diff --git a/spindle/ingester.go b/spindle/ingester.go
index 161a64d6..34bea0d5 100644
--- a/spindle/ingester.go
+++ b/spindle/ingester.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/db"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/db"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/atproto/identity"
diff --git a/spindle/models/engine.go b/spindle/models/engine.go
index 8ae5f83d..83f9d91c 100644
--- a/spindle/models/engine.go
+++ b/spindle/models/engine.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/spindle/secrets"
 )
 
 type Engine interface {
diff --git a/spindle/models/models.go b/spindle/models/models.go
index 538f17ef..c692ec19 100644
--- a/spindle/models/models.go
+++ b/spindle/models/models.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"slices"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 )
diff --git a/spindle/server.go b/spindle/server.go
index c2cf7f51..72446bb9 100644
--- a/spindle/server.go
+++ b/spindle/server.go
@@ -9,23 +9,23 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/eventconsumer"
-	"tangled.sh/tangled.sh/core/eventconsumer/cursor"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/jetstream"
-	"tangled.sh/tangled.sh/core/log"
-	"tangled.sh/tangled.sh/core/notifier"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/config"
-	"tangled.sh/tangled.sh/core/spindle/db"
-	"tangled.sh/tangled.sh/core/spindle/engine"
-	"tangled.sh/tangled.sh/core/spindle/engines/nixery"
-	"tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/spindle/queue"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
-	"tangled.sh/tangled.sh/core/spindle/xrpc"
-	"tangled.sh/tangled.sh/core/xrpc/serviceauth"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/eventconsumer"
+	"tangled.org/core/eventconsumer/cursor"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/jetstream"
+	"tangled.org/core/log"
+	"tangled.org/core/notifier"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/config"
+	"tangled.org/core/spindle/db"
+	"tangled.org/core/spindle/engine"
+	"tangled.org/core/spindle/engines/nixery"
+	"tangled.org/core/spindle/models"
+	"tangled.org/core/spindle/queue"
+	"tangled.org/core/spindle/secrets"
+	"tangled.org/core/spindle/xrpc"
+	"tangled.org/core/xrpc/serviceauth"
 )
 
 //go:embed motd
diff --git a/spindle/stream.go b/spindle/stream.go
index 3c06de8b..dd615926 100644
--- a/spindle/stream.go
+++ b/spindle/stream.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"tangled.sh/tangled.sh/core/spindle/models"
+	"tangled.org/core/spindle/models"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/websocket"
diff --git a/spindle/xrpc/add_secret.go b/spindle/xrpc/add_secret.go
index a196e14e..36945465 100644
--- a/spindle/xrpc/add_secret.go
+++ b/spindle/xrpc/add_secret.go
@@ -10,10 +10,10 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/secrets"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) AddSecret(w http.ResponseWriter, r *http.Request) {
diff --git a/spindle/xrpc/list_secrets.go b/spindle/xrpc/list_secrets.go
index 535284fa..535ed304 100644
--- a/spindle/xrpc/list_secrets.go
+++ b/spindle/xrpc/list_secrets.go
@@ -10,10 +10,10 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/secrets"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) ListSecrets(w http.ResponseWriter, r *http.Request) {
diff --git a/spindle/xrpc/owner.go b/spindle/xrpc/owner.go
index 02730e00..6d72a60c 100644
--- a/spindle/xrpc/owner.go
+++ b/spindle/xrpc/owner.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) {
diff --git a/spindle/xrpc/remove_secret.go b/spindle/xrpc/remove_secret.go
index 1f6b6aca..1021e91a 100644
--- a/spindle/xrpc/remove_secret.go
+++ b/spindle/xrpc/remove_secret.go
@@ -9,10 +9,10 @@ import (
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/xrpc"
 	securejoin "github.com/cyphar/filepath-securejoin"
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/secrets"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 func (x *Xrpc) RemoveSecret(w http.ResponseWriter, r *http.Request) {
diff --git a/spindle/xrpc/xrpc.go b/spindle/xrpc/xrpc.go
index c660da29..46caed92 100644
--- a/spindle/xrpc/xrpc.go
+++ b/spindle/xrpc/xrpc.go
@@ -8,15 +8,15 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
-	"tangled.sh/tangled.sh/core/idresolver"
-	"tangled.sh/tangled.sh/core/rbac"
-	"tangled.sh/tangled.sh/core/spindle/config"
-	"tangled.sh/tangled.sh/core/spindle/db"
-	"tangled.sh/tangled.sh/core/spindle/models"
-	"tangled.sh/tangled.sh/core/spindle/secrets"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
-	"tangled.sh/tangled.sh/core/xrpc/serviceauth"
+	"tangled.org/core/api/tangled"
+	"tangled.org/core/idresolver"
+	"tangled.org/core/rbac"
+	"tangled.org/core/spindle/config"
+	"tangled.org/core/spindle/db"
+	"tangled.org/core/spindle/models"
+	"tangled.org/core/spindle/secrets"
+	xrpcerr "tangled.org/core/xrpc/errors"
+	"tangled.org/core/xrpc/serviceauth"
 )
 
 const ActorDid string = "ActorDid"
diff --git a/workflow/compile.go b/workflow/compile.go
index 4f7090ae..aba5b434 100644
--- a/workflow/compile.go
+++ b/workflow/compile.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 type RawWorkflow struct {
diff --git a/workflow/compile_test.go b/workflow/compile_test.go
index dec8100d..e24a8c6a 100644
--- a/workflow/compile_test.go
+++ b/workflow/compile_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 )
 
 var trigger = tangled.Pipeline_TriggerMetadata{
diff --git a/workflow/def.go b/workflow/def.go
index 85838d1a..2660b8fb 100644
--- a/workflow/def.go
+++ b/workflow/def.go
@@ -6,7 +6,7 @@ import (
 	"slices"
 	"strings"
 
-	"tangled.sh/tangled.sh/core/api/tangled"
+	"tangled.org/core/api/tangled"
 
 	"github.com/go-git/go-git/v5/plumbing"
 	"gopkg.in/yaml.v3"
diff --git a/xrpc/serviceauth/service_auth.go b/xrpc/serviceauth/service_auth.go
index 73c37740..c45d3060 100644
--- a/xrpc/serviceauth/service_auth.go
+++ b/xrpc/serviceauth/service_auth.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/bluesky-social/indigo/atproto/auth"
-	"tangled.sh/tangled.sh/core/idresolver"
-	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"
+	"tangled.org/core/idresolver"
+	xrpcerr "tangled.org/core/xrpc/errors"
 )
 
 const ActorDid string = "ActorDid"