refactor: Reorganize folder structure for better readability

gizmo-ds · Dec 27, 2023 · 0f27352 · 0f27352
1 parent d215442
commit 0f27352
Show file tree

Hide file tree

Showing 69 changed files with 48 additions and 48 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -8,4 +8,4 @@ node_modules/
 
 Dockerfile
 docker-compose.yml
-/internal/mfm/out.js
+/pkg/mfm/out.js
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
 * text=auto eol=lf
 *.png binary
-internal/mfm/*.js -diff
+pkg/mfm/*.js -diff
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,5 @@ build/
 /data/
 node_modules/
 
-/config.toml
-/.env
-proxy/misskey/.env
-/internal/mfm/out.js
+config.toml
+.env
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker.io/oven/bun:latest AS mfm-builder
 WORKDIR /app
-COPY ./internal/mfm /app/internal/mfm
+COPY pkg/mfm /app/pkg/mfm
 COPY ./package.json /app/package.json
 COPY ./bun.lockb /app/bun.lockb
 RUN bun install && bun run build
@@ -10,7 +10,7 @@ WORKDIR /app
 COPY . /app
 ENV CGO_ENABLED=0
 ARG version=development
-COPY --from=mfm-builder /app/internal/mfm/out.js /app/internal/mfm/out.js
+COPY --from=mfm-builder /app/pkg/mfm/out.js /app/pkg/mfm/out.js
 RUN go mod download
 RUN go build -trimpath -tags timetzdata \
     -ldflags "-s -w -X github.com/gizmo-ds/misstodon/internal/global.AppVersion=$version" \

diff --git a/cmd/misstodon/main.go b/cmd/misstodon/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gizmo-ds/misstodon/cmd/misstodon/commands"
 	"github.com/gizmo-ds/misstodon/cmd/misstodon/logger"
 	"github.com/gizmo-ds/misstodon/internal/global"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

diff --git a/internal/api/nodeinfo/nodeinfo.go b/internal/api/nodeinfo/nodeinfo.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/api/middleware"
 	"github.com/gizmo-ds/misstodon/internal/global"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/oauth/oauth.go b/internal/api/oauth/oauth.go
@@ -9,7 +9,7 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/api/middleware"
 	"github.com/gizmo-ds/misstodon/internal/global"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v1/accounts.go b/internal/api/v1/accounts.go
@@ -8,8 +8,8 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/api/httperror"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 )

diff --git a/internal/api/v1/application.go b/internal/api/v1/application.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/global"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 )

diff --git a/internal/api/v1/instance.go b/internal/api/v1/instance.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/global"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v1/media.go b/internal/api/v1/media.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v1/notifications.go b/internal/api/v1/notifications.go
@@ -6,8 +6,8 @@ import (
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gizmo-ds/misstodon/internal/api/httperror"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v1/statuses.go b/internal/api/v1/statuses.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/api/httperror"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 )

diff --git a/internal/api/v1/streaming.go b/internal/api/v1/streaming.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey/streaming"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey/streaming"
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"

diff --git a/internal/api/v1/timelines.go b/internal/api/v1/timelines.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v1/trends.go b/internal/api/v1/trends.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/v2/media.go b/internal/api/v2/media.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/internal/api/wellknown/wellknown.go b/internal/api/wellknown/wellknown.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/api/httperror"
 	"github.com/gizmo-ds/misstodon/internal/api/middleware"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "misstodon",
   "scripts": {
-    "build": "esbuild internal/mfm/parse.ts --bundle --format=esm --platform=node --target=es2017 --minify --outfile=internal/mfm/out.js"
+    "build": "esbuild pkg/mfm/parse.ts --bundle --format=esm --platform=node --target=es2017 --minify --outfile=pkg/mfm/out.js"
   },
   "private": true,
   "author": "Gizmo",

diff --git a/pkg/mfm/.gitignore b/pkg/mfm/.gitignore
@@ -0,0 +1 @@
+out.js
diff --git a/internal/mfm/mastodon.go → pkg/mfm/mastodon.go b/internal/mfm/mastodon.go → pkg/mfm/mastodon.go
diff --git a/internal/mfm/mfm.go → pkg/mfm/mfm.go b/internal/mfm/mfm.go → pkg/mfm/mfm.go
diff --git a/internal/mfm/mfm_test.go → pkg/mfm/mfm_test.go b/internal/mfm/mfm_test.go → pkg/mfm/mfm_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gizmo-ds/misstodon/internal/mfm"
+	"github.com/gizmo-ds/misstodon/pkg/mfm"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"

diff --git a/internal/mfm/models.go → pkg/mfm/models.go b/internal/mfm/models.go → pkg/mfm/models.go
diff --git a/internal/mfm/parse.ts → pkg/mfm/parse.ts b/internal/mfm/parse.ts → pkg/mfm/parse.ts
diff --git a/models/Account.go → pkg/misstodon/models/Account.go b/models/Account.go → pkg/misstodon/models/Account.go
diff --git a/models/Application.go → pkg/misstodon/models/Application.go b/models/Application.go → pkg/misstodon/models/Application.go
diff --git a/models/Context.go → pkg/misstodon/models/Context.go b/models/Context.go → pkg/misstodon/models/Context.go
diff --git a/models/CustomEmoji.go → pkg/misstodon/models/CustomEmoji.go b/models/CustomEmoji.go → pkg/misstodon/models/CustomEmoji.go
diff --git a/models/Instance.go → pkg/misstodon/models/Instance.go b/models/Instance.go → pkg/misstodon/models/Instance.go
diff --git a/models/MediaAttachment.go → pkg/misstodon/models/MediaAttachment.go b/models/MediaAttachment.go → pkg/misstodon/models/MediaAttachment.go
diff --git a/models/MkApplication.go → pkg/misstodon/models/MkApplication.go b/models/MkApplication.go → pkg/misstodon/models/MkApplication.go
diff --git a/models/MkEmoji.go → pkg/misstodon/models/MkEmoji.go b/models/MkEmoji.go → pkg/misstodon/models/MkEmoji.go
diff --git a/models/MkFile.go → pkg/misstodon/models/MkFile.go b/models/MkFile.go → pkg/misstodon/models/MkFile.go
diff --git a/models/MkMeta.go → pkg/misstodon/models/MkMeta.go b/models/MkMeta.go → pkg/misstodon/models/MkMeta.go
diff --git a/models/MkNote.go → pkg/misstodon/models/MkNote.go b/models/MkNote.go → pkg/misstodon/models/MkNote.go
@@ -1,9 +1,9 @@
 package models
 
 import (
-	"github.com/gizmo-ds/misstodon/internal/mfm"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
+	"github.com/gizmo-ds/misstodon/pkg/mfm"
 )
 
 type MkNoteVisibility string

diff --git a/models/MkNotification.go → pkg/misstodon/models/MkNotification.go b/models/MkNotification.go → pkg/misstodon/models/MkNotification.go
diff --git a/models/MkRelation.go → pkg/misstodon/models/MkRelation.go b/models/MkRelation.go → pkg/misstodon/models/MkRelation.go
diff --git a/models/MkStats.go → pkg/misstodon/models/MkStats.go b/models/MkStats.go → pkg/misstodon/models/MkStats.go
diff --git a/models/MkStreamMessage.go → pkg/misstodon/models/MkStreamMessage.go b/models/MkStreamMessage.go → pkg/misstodon/models/MkStreamMessage.go
diff --git a/models/MkUser.go → pkg/misstodon/models/MkUser.go b/models/MkUser.go → pkg/misstodon/models/MkUser.go
@@ -3,9 +3,9 @@ package models
 import (
 	"time"
 
-	"github.com/gizmo-ds/misstodon/internal/mfm"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
+	"github.com/gizmo-ds/misstodon/pkg/mfm"
 	"github.com/pkg/errors"
 )
 

diff --git a/models/NodeInfo.go → pkg/misstodon/models/NodeInfo.go b/models/NodeInfo.go → pkg/misstodon/models/NodeInfo.go
diff --git a/models/Notification.go → pkg/misstodon/models/Notification.go b/models/Notification.go → pkg/misstodon/models/Notification.go
diff --git a/models/Relationship.go → pkg/misstodon/models/Relationship.go b/models/Relationship.go → pkg/misstodon/models/Relationship.go
diff --git a/models/Status.go → pkg/misstodon/models/Status.go b/models/Status.go → pkg/misstodon/models/Status.go
diff --git a/models/StreamEvent.go → pkg/misstodon/models/StreamEvent.go b/models/StreamEvent.go → pkg/misstodon/models/StreamEvent.go
diff --git a/models/Tag.go → pkg/misstodon/models/Tag.go b/models/Tag.go → pkg/misstodon/models/Tag.go
diff --git a/models/Timelines.go → pkg/misstodon/models/Timelines.go b/models/Timelines.go → pkg/misstodon/models/Timelines.go
diff --git a/proxy/misskey/.env.example → pkg/misstodon/provider/misskey/.env.example b/proxy/misskey/.env.example → pkg/misstodon/provider/misskey/.env.example
diff --git a/pkg/misstodon/provider/misskey/.gitignore b/pkg/misstodon/provider/misskey/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/proxy/misskey/accounts.go → pkg/misstodon/provider/misskey/accounts.go b/proxy/misskey/accounts.go → pkg/misstodon/provider/misskey/accounts.go
@@ -11,7 +11,7 @@ import (
 	"github.com/gizmo-ds/misstodon/internal/global"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/accounts_test.go → ...sstodon/provider/misskey/accounts_test.go b/proxy/misskey/accounts_test.go → ...sstodon/provider/misskey/accounts_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/proxy/misskey/application.go → ...misstodon/provider/misskey/application.go b/proxy/misskey/application.go → ...misstodon/provider/misskey/application.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/drive.go → pkg/misstodon/provider/misskey/drive.go b/proxy/misskey/drive.go → pkg/misstodon/provider/misskey/drive.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/errors.go → pkg/misstodon/provider/misskey/errors.go b/proxy/misskey/errors.go → pkg/misstodon/provider/misskey/errors.go
diff --git a/proxy/misskey/httpclient.go → pkg/misstodon/provider/misskey/httpclient.go b/proxy/misskey/httpclient.go → pkg/misstodon/provider/misskey/httpclient.go
diff --git a/proxy/misskey/instance.go → pkg/misstodon/provider/misskey/instance.go b/proxy/misskey/instance.go → pkg/misstodon/provider/misskey/instance.go
@@ -7,7 +7,7 @@ import (
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/instance_test.go → ...sstodon/provider/misskey/instance_test.go b/proxy/misskey/instance_test.go → ...sstodon/provider/misskey/instance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/proxy/misskey/media.go → pkg/misstodon/provider/misskey/media.go b/proxy/misskey/media.go → pkg/misstodon/provider/misskey/media.go
@@ -4,7 +4,7 @@ import (
 	"mime/multipart"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/misskey_test.go → ...isstodon/provider/misskey/misskey_test.go b/proxy/misskey/misskey_test.go → ...isstodon/provider/misskey/misskey_test.go
diff --git a/proxy/misskey/notifications.go → ...sstodon/provider/misskey/notifications.go b/proxy/misskey/notifications.go → ...sstodon/provider/misskey/notifications.go
@@ -6,7 +6,7 @@ import (
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/oauth.go → pkg/misstodon/provider/misskey/oauth.go b/proxy/misskey/oauth.go → pkg/misstodon/provider/misskey/oauth.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/statuses.go → pkg/misstodon/provider/misskey/statuses.go b/proxy/misskey/statuses.go → pkg/misstodon/provider/misskey/statuses.go
@@ -7,7 +7,7 @@ import (
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/streaming/streaming.go → ...n/provider/misskey/streaming/streaming.go b/proxy/misskey/streaming/streaming.go → ...n/provider/misskey/streaming/streaming.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/gorilla/websocket"
 	"github.com/rs/xid"
 )

diff --git a/proxy/misskey/timelines.go → pkg/misstodon/provider/misskey/timelines.go b/proxy/misskey/timelines.go → pkg/misstodon/provider/misskey/timelines.go
@@ -4,7 +4,7 @@ import (
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 	"github.com/pkg/errors"
 )
 

diff --git a/proxy/misskey/timelines_test.go → ...stodon/provider/misskey/timelines_test.go b/proxy/misskey/timelines_test.go → ...stodon/provider/misskey/timelines_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
-	"github.com/gizmo-ds/misstodon/models"
-	"github.com/gizmo-ds/misstodon/proxy/misskey"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/provider/misskey"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/proxy/misskey/trends.go → pkg/misstodon/provider/misskey/trends.go b/proxy/misskey/trends.go → pkg/misstodon/provider/misskey/trends.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gizmo-ds/misstodon/internal/misstodon"
 	"github.com/gizmo-ds/misstodon/internal/utils"
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 )
 
 func TrendsTags(ctx misstodon.Context, limit, offset int) ([]models.Tag, error) {

diff --git a/proxy/misskey/utils.go → pkg/misstodon/provider/misskey/utils.go b/proxy/misskey/utils.go → pkg/misstodon/provider/misskey/utils.go
diff --git a/proxy/misskey/wellknown.go → pkg/misstodon/provider/misskey/wellknown.go b/proxy/misskey/wellknown.go → pkg/misstodon/provider/misskey/wellknown.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/gizmo-ds/misstodon/models"
+	"github.com/gizmo-ds/misstodon/pkg/misstodon/models"
 )
 
 func NodeInfo(server string, ni models.NodeInfo) (models.NodeInfo, error) {