From 14baee03fef15628cd725da9beb54c9846a3802d Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 27 Oct 2024 12:50:07 +0800
Subject: [PATCH] :truck: Move http server package

---
 .idea/workspace.xml                           | 44 +++++++++++++++++++
 go.mod                                        | 10 ++---
 go.sum                                        | 10 +++++
 pkg/internal/gap/server.go                    |  3 +-
 pkg/internal/grpc/auth.go                     | 10 ++---
 pkg/internal/grpc/events.go                   |  2 +-
 pkg/internal/grpc/health.go                   |  4 +-
 pkg/internal/grpc/notifier.go                 |  6 +--
 pkg/internal/grpc/realms.go                   | 14 +++---
 pkg/internal/grpc/server.go                   |  8 ++--
 pkg/internal/grpc/stream.go                   |  2 +-
 .../{server => http}/admin/badges_api.go      |  2 +-
 .../{server => http}/admin/factors_api.go     |  2 +-
 pkg/internal/{server => http}/admin/index.go  |  0
 .../{server => http}/admin/notify_api.go      |  2 +-
 .../{server => http}/admin/permissions_api.go |  2 +-
 .../{server => http}/admin/users_api.go       |  2 +-
 .../{server => http}/api/accounts_api.go      |  2 +-
 pkg/internal/{server => http}/api/auth_api.go |  2 +-
 .../{server => http}/api/avatar_api.go        |  2 +-
 .../{server => http}/api/bot_token_api.go     |  2 +-
 pkg/internal/{server => http}/api/bots_api.go |  2 +-
 .../{server => http}/api/factors_api.go       |  2 +-
 pkg/internal/{server => http}/api/index.go    |  0
 .../{server => http}/api/notifications_api.go |  2 +-
 .../{server => http}/api/notify_api.go        |  2 +-
 .../{server => http}/api/oauth_api.go         |  2 +-
 .../{server => http}/api/preferences_api.go   |  2 +-
 .../{server => http}/api/realm_members_api.go |  2 +-
 .../{server => http}/api/realms_api.go        |  2 +-
 .../{server => http}/api/relationships_api.go |  2 +-
 .../{server => http}/api/reports_api.go       |  2 +-
 .../{server => http}/api/security_api.go      |  2 +-
 pkg/internal/{server => http}/api/sign_api.go |  2 +-
 .../{server => http}/api/statuses_api.go      |  2 +-
 .../{server => http}/api/userinfo_api.go      |  0
 .../{server => http}/api/well_known_api.go    |  0
 pkg/internal/{server => http}/exts/auth.go    |  0
 pkg/internal/{server => http}/exts/request.go |  0
 pkg/internal/{server => http}/server.go       | 16 +++----
 pkg/main.go                                   | 10 ++---
 pkg/proto/notify_grpc.pb.go                   |  2 +-
 pkg/proto/realm_grpc.pb.go                    |  2 +-
 pkg/proto/record_grpc.pb.go                   |  2 +-
 settings.toml                                 |  4 +-
 45 files changed, 124 insertions(+), 69 deletions(-)
 rename pkg/internal/{server => http}/admin/badges_api.go (96%)
 rename pkg/internal/{server => http}/admin/factors_api.go (94%)
 rename pkg/internal/{server => http}/admin/index.go (100%)
 rename pkg/internal/{server => http}/admin/notify_api.go (98%)
 rename pkg/internal/{server => http}/admin/permissions_api.go (95%)
 rename pkg/internal/{server => http}/admin/users_api.go (96%)
 rename pkg/internal/{server => http}/api/accounts_api.go (99%)
 rename pkg/internal/{server => http}/api/auth_api.go (98%)
 rename pkg/internal/{server => http}/api/avatar_api.go (97%)
 rename pkg/internal/{server => http}/api/bot_token_api.go (98%)
 rename pkg/internal/{server => http}/api/bots_api.go (97%)
 rename pkg/internal/{server => http}/api/factors_api.go (97%)
 rename pkg/internal/{server => http}/api/index.go (100%)
 rename pkg/internal/{server => http}/api/notifications_api.go (98%)
 rename pkg/internal/{server => http}/api/notify_api.go (96%)
 rename pkg/internal/{server => http}/api/oauth_api.go (98%)
 rename pkg/internal/{server => http}/api/preferences_api.go (96%)
 rename pkg/internal/{server => http}/api/realm_members_api.go (98%)
 rename pkg/internal/{server => http}/api/realms_api.go (98%)
 rename pkg/internal/{server => http}/api/relationships_api.go (99%)
 rename pkg/internal/{server => http}/api/reports_api.go (96%)
 rename pkg/internal/{server => http}/api/security_api.go (95%)
 rename pkg/internal/{server => http}/api/sign_api.go (97%)
 rename pkg/internal/{server => http}/api/statuses_api.go (98%)
 rename pkg/internal/{server => http}/api/userinfo_api.go (100%)
 rename pkg/internal/{server => http}/api/well_known_api.go (100%)
 rename pkg/internal/{server => http}/exts/auth.go (100%)
 rename pkg/internal/{server => http}/exts/request.go (100%)
 rename pkg/internal/{server => http}/server.go (82%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7f778b8..27d67c3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,51 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":recycle: All parts into nexus">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/gap/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/gap/server.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/auth.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/auth.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/events.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/events.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/health.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/health.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/notifier.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/notifier.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/realms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/realms.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/server.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/stream.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/stream.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/badges_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/badges_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/factors_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/factors_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/index.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/notify_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/notify_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/permissions_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/permissions_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/users_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/admin/users_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/accounts_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/accounts_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/auth_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/auth_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/avatar_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/avatar_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/bot_token_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/bot_token_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/bots_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/bots_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/factors_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/factors_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/index.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/notifications_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/notifications_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/notify_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/notify_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/oauth_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/oauth_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/preferences_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/preferences_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/realm_members_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/realm_members_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/realms_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/realms_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/relationships_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/relationships_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/reports_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/reports_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/security_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/security_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/sign_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/sign_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/statuses_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/statuses_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/userinfo_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/userinfo_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/well_known_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/api/well_known_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/exts/auth.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/exts/auth.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/exts/request.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/exts/request.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/http/server.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/proto/notify_grpc.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/notify_grpc.pb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/proto/realm_grpc.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/realm_grpc.pb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/proto/record_grpc.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/record_grpc.pb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/go.mod b/go.mod
index e7ca750..adc109b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.solsynth.dev/hydrogen/passport
 go 1.23.2
 
 require (
-	git.solsynth.dev/hypernet/nexus v0.0.0-20241024155238-421834ae5c4a
+	git.solsynth.dev/hypernet/nexus v0.0.0-20241026162044-3d487fa48baf
 	git.solsynth.dev/hypernet/pusher v0.0.0-20241026153052-cd2c326efa4e
 	github.com/dgraph-io/ristretto v0.1.1
 	github.com/eko/gocache/lib/v4 v4.1.6
@@ -23,7 +23,7 @@ require (
 	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.35.1
 	gorm.io/datatypes v1.2.4
-	gorm.io/driver/postgres v1.5.4
+	gorm.io/driver/postgres v1.5.9
 	gorm.io/gorm v1.25.12
 )
 
@@ -55,9 +55,9 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgx/v5 v5.5.5 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index 1644e14..ad80605 100644
--- a/go.sum
+++ b/go.sum
@@ -35,6 +35,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.solsynth.dev/hypernet/nexus v0.0.0-20241024155238-421834ae5c4a h1:yl2cnfFvvgOGwr9qoWu4QQHVpVPCI9f1idyaKt2gXxo=
 git.solsynth.dev/hypernet/nexus v0.0.0-20241024155238-421834ae5c4a/go.mod h1:68l4+CkuG3sz9aiUhbN5tq3YHrt6KUNK9FIWaGuWCdc=
+git.solsynth.dev/hypernet/nexus v0.0.0-20241026162044-3d487fa48baf h1:Fil1ASTvxmqFySD3OoptC7uRXEYpWLwLfjlkWZNNwVQ=
+git.solsynth.dev/hypernet/nexus v0.0.0-20241026162044-3d487fa48baf/go.mod h1:fXQsHXGio+7/0U95IitKF07wS4yTdCMp5ms8wpFBwVI=
 git.solsynth.dev/hypernet/pusher v0.0.0-20241026153052-cd2c326efa4e h1:DtHhMjgxS/spUt/KEdbRFtaVnepI6Vx8pbHdJaNH1hs=
 git.solsynth.dev/hypernet/pusher v0.0.0-20241026153052-cd2c326efa4e/go.mod h1:XHTqFU/vBe4JiuAjl87GUcL8+w/IizSNoqH6n3WkQFc=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -254,10 +256,16 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
 github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
 github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
+github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -789,6 +797,8 @@ gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
 gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
 gorm.io/driver/postgres v1.5.4 h1:Iyrp9Meh3GmbSuyIAGyjkN+n9K+GHX9b9MqsTL4EJCo=
 gorm.io/driver/postgres v1.5.4/go.mod h1:Bgo89+h0CRcdA33Y6frlaHHVuTdOf87pmyzwW9C/BH0=
+gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
+gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
 gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
 gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
 gorm.io/driver/sqlserver v1.4.1 h1:t4r4r6Jam5E6ejqP7N82qAJIJAht27EGT41HyPfXRw0=
diff --git a/pkg/internal/gap/server.go b/pkg/internal/gap/server.go
index ada94b7..ce830f2 100644
--- a/pkg/internal/gap/server.go
+++ b/pkg/internal/gap/server.go
@@ -6,6 +6,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"git.solsynth.dev/hypernet/pusher/pkg/pushkit/pushcon"
 	"github.com/rs/zerolog/log"
+	"github.com/samber/lo"
 	"strings"
 
 	"github.com/spf13/viper"
@@ -29,7 +30,7 @@ func InitializeToNexus() error {
 		Type:     nex.ServiceTypeAuth,
 		Label:    "Passport",
 		GrpcAddr: grpcOutbound,
-		HttpAddr: &httpOutbound,
+		HttpAddr: lo.ToPtr("http://" + httpOutbound),
 	})
 	if err == nil {
 		go func() {
diff --git a/pkg/internal/grpc/auth.go b/pkg/internal/grpc/auth.go
index ea668e9..2a551be 100644
--- a/pkg/internal/grpc/auth.go
+++ b/pkg/internal/grpc/auth.go
@@ -18,7 +18,7 @@ type authenticateServer struct {
 	proto.UnimplementedAuthServiceServer
 }
 
-func (v *Server) Authenticate(_ context.Context, in *proto.AuthRequest) (*proto.AuthReply, error) {
+func (v *App) Authenticate(_ context.Context, in *proto.AuthRequest) (*proto.AuthReply, error) {
 	ticket, perms, err := services.Authenticate(uint(in.GetSessionId()))
 	if err != nil {
 		return &proto.AuthReply{
@@ -43,7 +43,7 @@ func (v *Server) Authenticate(_ context.Context, in *proto.AuthRequest) (*proto.
 	}
 }
 
-func (v *Server) EnsurePermGranted(_ context.Context, in *proto.CheckPermRequest) (*proto.CheckPermResponse, error) {
+func (v *App) EnsurePermGranted(_ context.Context, in *proto.CheckPermRequest) (*proto.CheckPermResponse, error) {
 	ctx, err := services.GetAuthContext(uint(in.GetSessionId()))
 	if err != nil {
 		return nil, err
@@ -63,7 +63,7 @@ func (v *Server) EnsurePermGranted(_ context.Context, in *proto.CheckPermRequest
 	}, nil
 }
 
-func (v *Server) EnsureUserPermGranted(_ context.Context, in *proto.CheckUserPermRequest) (*proto.CheckUserPermResponse, error) {
+func (v *App) EnsureUserPermGranted(_ context.Context, in *proto.CheckUserPermRequest) (*proto.CheckUserPermResponse, error) {
 	relation, err := services.GetRelationWithTwoNode(uint(in.GetUserId()), uint(in.GetOtherId()))
 	if err != nil {
 		return &proto.CheckUserPermResponse{
@@ -82,7 +82,7 @@ func (v *Server) EnsureUserPermGranted(_ context.Context, in *proto.CheckUserPer
 	}, nil
 }
 
-func (v *Server) ListUserFriends(_ context.Context, in *proto.ListUserRelativeRequest) (*proto.ListUserRelativeResponse, error) {
+func (v *App) ListUserFriends(_ context.Context, in *proto.ListUserRelativeRequest) (*proto.ListUserRelativeResponse, error) {
 	tx := database.C.Preload("Account").Where("status = ?", models.RelationshipFriend)
 
 	if in.GetIsRelated() {
@@ -108,7 +108,7 @@ func (v *Server) ListUserFriends(_ context.Context, in *proto.ListUserRelativeRe
 	}, nil
 }
 
-func (v *Server) ListUserBlocklist(_ context.Context, in *proto.ListUserRelativeRequest) (*proto.ListUserRelativeResponse, error) {
+func (v *App) ListUserBlocklist(_ context.Context, in *proto.ListUserRelativeRequest) (*proto.ListUserRelativeResponse, error) {
 	tx := database.C.Preload("Account").Where("status = ?", models.RelationshipBlocked)
 
 	if in.GetIsRelated() {
diff --git a/pkg/internal/grpc/events.go b/pkg/internal/grpc/events.go
index 714c7f4..32f6904 100644
--- a/pkg/internal/grpc/events.go
+++ b/pkg/internal/grpc/events.go
@@ -6,7 +6,7 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 )
 
-func (v *Server) RecordEvent(ctx context.Context, request *proto.RecordEventRequest) (*proto.RecordEventResponse, error) {
+func (v *App) RecordEvent(ctx context.Context, request *proto.RecordEventRequest) (*proto.RecordEventResponse, error) {
 	services.AddEvent(
 		uint(request.GetUserId()),
 		request.GetAction(),
diff --git a/pkg/internal/grpc/health.go b/pkg/internal/grpc/health.go
index d71549a..48b208d 100644
--- a/pkg/internal/grpc/health.go
+++ b/pkg/internal/grpc/health.go
@@ -6,13 +6,13 @@ import (
 	"time"
 )
 
-func (v *Server) Check(ctx context.Context, request *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
+func (v *App) Check(ctx context.Context, request *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
 	return &health.HealthCheckResponse{
 		Status: health.HealthCheckResponse_SERVING,
 	}, nil
 }
 
-func (v *Server) Watch(request *health.HealthCheckRequest, server health.Health_WatchServer) error {
+func (v *App) Watch(request *health.HealthCheckRequest, server health.Health_WatchServer) error {
 	for {
 		if server.Send(&health.HealthCheckResponse{
 			Status: health.HealthCheckResponse_SERVING,
diff --git a/pkg/internal/grpc/notifier.go b/pkg/internal/grpc/notifier.go
index 613015b..908cd1f 100644
--- a/pkg/internal/grpc/notifier.go
+++ b/pkg/internal/grpc/notifier.go
@@ -14,7 +14,7 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 )
 
-func (v *Server) NotifyUser(_ context.Context, in *proto.NotifyUserRequest) (*proto.NotifyResponse, error) {
+func (v *App) NotifyUser(_ context.Context, in *proto.NotifyUserRequest) (*proto.NotifyResponse, error) {
 	var err error
 	var user models.Account
 	if user, err = services.GetAccount(uint(in.GetUserId())); err != nil {
@@ -52,7 +52,7 @@ func (v *Server) NotifyUser(_ context.Context, in *proto.NotifyUserRequest) (*pr
 	}, nil
 }
 
-func (v *Server) NotifyUserBatch(_ context.Context, in *proto.NotifyUserBatchRequest) (*proto.NotifyResponse, error) {
+func (v *App) NotifyUserBatch(_ context.Context, in *proto.NotifyUserBatchRequest) (*proto.NotifyResponse, error) {
 	var err error
 	var users []models.Account
 	if users, err = services.GetAccountList(lo.Map(in.GetUserId(), func(item uint64, index int) uint {
@@ -101,7 +101,7 @@ func (v *Server) NotifyUserBatch(_ context.Context, in *proto.NotifyUserBatchReq
 	}, nil
 }
 
-func (v *Server) NotifyAllUser(_ context.Context, in *proto.NotifyRequest) (*proto.NotifyResponse, error) {
+func (v *App) NotifyAllUser(_ context.Context, in *proto.NotifyRequest) (*proto.NotifyResponse, error) {
 	var users []models.Account
 	if err := database.C.Find(&users).Error; err != nil {
 		return nil, fmt.Errorf("unable to get account: %v", err)
diff --git a/pkg/internal/grpc/realms.go b/pkg/internal/grpc/realms.go
index 2b90b77..fa1ad6e 100644
--- a/pkg/internal/grpc/realms.go
+++ b/pkg/internal/grpc/realms.go
@@ -12,7 +12,7 @@ import (
 	"github.com/samber/lo"
 )
 
-func (v *Server) ListCommunityRealm(ctx context.Context, empty *proto.ListRealmRequest) (*proto.ListRealmResponse, error) {
+func (v *App) ListCommunityRealm(ctx context.Context, empty *proto.ListRealmRequest) (*proto.ListRealmResponse, error) {
 	realms, err := services.ListCommunityRealm()
 	if err != nil {
 		return nil, err
@@ -40,7 +40,7 @@ func (v *Server) ListCommunityRealm(ctx context.Context, empty *proto.ListRealmR
 	}, nil
 }
 
-func (v *Server) ListAvailableRealm(ctx context.Context, request *proto.LookupUserRealmRequest) (*proto.ListRealmResponse, error) {
+func (v *App) ListAvailableRealm(ctx context.Context, request *proto.LookupUserRealmRequest) (*proto.ListRealmResponse, error) {
 	account, err := services.GetAccount(uint(request.GetUserId()))
 	if err != nil {
 		return nil, fmt.Errorf("unable to find target account: %v", err)
@@ -72,7 +72,7 @@ func (v *Server) ListAvailableRealm(ctx context.Context, request *proto.LookupUs
 	}, nil
 }
 
-func (v *Server) ListOwnedRealm(ctx context.Context, request *proto.LookupUserRealmRequest) (*proto.ListRealmResponse, error) {
+func (v *App) ListOwnedRealm(ctx context.Context, request *proto.LookupUserRealmRequest) (*proto.ListRealmResponse, error) {
 	account, err := services.GetAccount(uint(request.GetUserId()))
 	if err != nil {
 		return nil, fmt.Errorf("unable to find target account: %v", err)
@@ -104,7 +104,7 @@ func (v *Server) ListOwnedRealm(ctx context.Context, request *proto.LookupUserRe
 	}, nil
 }
 
-func (v *Server) GetRealm(ctx context.Context, request *proto.LookupRealmRequest) (*proto.RealmInfo, error) {
+func (v *App) GetRealm(ctx context.Context, request *proto.LookupRealmRequest) (*proto.RealmInfo, error) {
 	var realm models.Realm
 
 	tx := database.C.Model(&models.Realm{})
@@ -143,7 +143,7 @@ func (v *Server) GetRealm(ctx context.Context, request *proto.LookupRealmRequest
 	return info, nil
 }
 
-func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.ListRealmMemberResponse, error) {
+func (v *App) ListRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.ListRealmMemberResponse, error) {
 	var members []models.RealmMember
 	if request.UserId == nil && request.RealmId == nil {
 		return nil, fmt.Errorf("either user id or realm id must be provided")
@@ -171,7 +171,7 @@ func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMember
 	}, nil
 }
 
-func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.RealmMemberInfo, error) {
+func (v *App) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.RealmMemberInfo, error) {
 	var member models.RealmMember
 	if request.UserId == nil && request.RealmId == nil {
 		return nil, fmt.Errorf("either user id or realm id must be provided")
@@ -195,7 +195,7 @@ func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberL
 	}, nil
 }
 
-func (v *Server) CheckRealmMemberPerm(ctx context.Context, request *proto.CheckRealmPermRequest) (*proto.CheckRealmPermResponse, error) {
+func (v *App) CheckRealmMemberPerm(ctx context.Context, request *proto.CheckRealmPermRequest) (*proto.CheckRealmPermResponse, error) {
 	var member models.RealmMember
 	tx := database.C.
 		Where("realm_id = ?", request.GetRealmId()).
diff --git a/pkg/internal/grpc/server.go b/pkg/internal/grpc/server.go
index c6d406c..9f3ccb9 100644
--- a/pkg/internal/grpc/server.go
+++ b/pkg/internal/grpc/server.go
@@ -13,7 +13,7 @@ import (
 	health "google.golang.org/grpc/health/grpc_health_v1"
 )
 
-type Server struct {
+type App struct {
 	nroto.UnimplementedAuthServiceServer
 	nroto.UnimplementedDirectoryServiceServer
 	proto.UnimplementedNotifierServer
@@ -24,8 +24,8 @@ type Server struct {
 	srv *grpc.Server
 }
 
-func NewServer() *Server {
-	server := &Server{
+func NewServer() *App {
+	server := &App{
 		srv: grpc.NewServer(),
 	}
 
@@ -40,7 +40,7 @@ func NewServer() *Server {
 	return server
 }
 
-func (v *Server) Listen() error {
+func (v *App) Listen() error {
 	listener, err := net.Listen("tcp", viper.GetString("grpc_bind"))
 	if err != nil {
 		return err
diff --git a/pkg/internal/grpc/stream.go b/pkg/internal/grpc/stream.go
index bbdbad6..579b170 100644
--- a/pkg/internal/grpc/stream.go
+++ b/pkg/internal/grpc/stream.go
@@ -7,7 +7,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 )
 
-func (v *Server) BroadcastEvent(ctx context.Context, request *proto.EventInfo) (*proto.EventResponse, error) {
+func (v *App) BroadcastEvent(ctx context.Context, request *proto.EventInfo) (*proto.EventResponse, error) {
 	switch request.GetEvent() {
 	case "ws.client.register":
 		// No longer need update user online status
diff --git a/pkg/internal/server/admin/badges_api.go b/pkg/internal/http/admin/badges_api.go
similarity index 96%
rename from pkg/internal/server/admin/badges_api.go
rename to pkg/internal/http/admin/badges_api.go
index 4c7420a..f18a0ca 100644
--- a/pkg/internal/server/admin/badges_api.go
+++ b/pkg/internal/http/admin/badges_api.go
@@ -2,7 +2,7 @@ package admin
 
 import (
 	"fmt"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
diff --git a/pkg/internal/server/admin/factors_api.go b/pkg/internal/http/admin/factors_api.go
similarity index 94%
rename from pkg/internal/server/admin/factors_api.go
rename to pkg/internal/http/admin/factors_api.go
index 3de5cc7..685086c 100644
--- a/pkg/internal/server/admin/factors_api.go
+++ b/pkg/internal/http/admin/factors_api.go
@@ -2,8 +2,8 @@ package admin
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"github.com/gofiber/fiber/v2"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/samber/lo"
diff --git a/pkg/internal/server/admin/index.go b/pkg/internal/http/admin/index.go
similarity index 100%
rename from pkg/internal/server/admin/index.go
rename to pkg/internal/http/admin/index.go
diff --git a/pkg/internal/server/admin/notify_api.go b/pkg/internal/http/admin/notify_api.go
similarity index 98%
rename from pkg/internal/server/admin/notify_api.go
rename to pkg/internal/http/admin/notify_api.go
index a5fd51e..12e70f3 100644
--- a/pkg/internal/server/admin/notify_api.go
+++ b/pkg/internal/http/admin/notify_api.go
@@ -2,8 +2,8 @@ package admin
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
diff --git a/pkg/internal/server/admin/permissions_api.go b/pkg/internal/http/admin/permissions_api.go
similarity index 95%
rename from pkg/internal/server/admin/permissions_api.go
rename to pkg/internal/http/admin/permissions_api.go
index 2ec752c..927edb4 100644
--- a/pkg/internal/server/admin/permissions_api.go
+++ b/pkg/internal/http/admin/permissions_api.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/admin/users_api.go b/pkg/internal/http/admin/users_api.go
similarity index 96%
rename from pkg/internal/server/admin/users_api.go
rename to pkg/internal/http/admin/users_api.go
index 7e919ca..cdd22bf 100644
--- a/pkg/internal/server/admin/users_api.go
+++ b/pkg/internal/http/admin/users_api.go
@@ -3,8 +3,8 @@ package admin
 import (
 	"fmt"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/accounts_api.go b/pkg/internal/http/api/accounts_api.go
similarity index 99%
rename from pkg/internal/server/api/accounts_api.go
rename to pkg/internal/http/api/accounts_api.go
index 9f06241..fcae350 100644
--- a/pkg/internal/server/api/accounts_api.go
+++ b/pkg/internal/http/api/accounts_api.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
diff --git a/pkg/internal/server/api/auth_api.go b/pkg/internal/http/api/auth_api.go
similarity index 98%
rename from pkg/internal/server/api/auth_api.go
rename to pkg/internal/http/api/auth_api.go
index 642e79b..93370df 100644
--- a/pkg/internal/server/api/auth_api.go
+++ b/pkg/internal/http/api/auth_api.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"github.com/gofiber/fiber/v2"
 
diff --git a/pkg/internal/server/api/avatar_api.go b/pkg/internal/http/api/avatar_api.go
similarity index 97%
rename from pkg/internal/server/api/avatar_api.go
rename to pkg/internal/http/api/avatar_api.go
index 13b9d5c..7be6833 100644
--- a/pkg/internal/server/api/avatar_api.go
+++ b/pkg/internal/http/api/avatar_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
diff --git a/pkg/internal/server/api/bot_token_api.go b/pkg/internal/http/api/bot_token_api.go
similarity index 98%
rename from pkg/internal/server/api/bot_token_api.go
rename to pkg/internal/http/api/bot_token_api.go
index d995b61..b6d6b5c 100644
--- a/pkg/internal/server/api/bot_token_api.go
+++ b/pkg/internal/http/api/bot_token_api.go
@@ -3,8 +3,8 @@ package api
 import (
 	"fmt"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
diff --git a/pkg/internal/server/api/bots_api.go b/pkg/internal/http/api/bots_api.go
similarity index 97%
rename from pkg/internal/server/api/bots_api.go
rename to pkg/internal/http/api/bots_api.go
index ff30815..ea6be10 100644
--- a/pkg/internal/server/api/bots_api.go
+++ b/pkg/internal/http/api/bots_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
diff --git a/pkg/internal/server/api/factors_api.go b/pkg/internal/http/api/factors_api.go
similarity index 97%
rename from pkg/internal/server/api/factors_api.go
rename to pkg/internal/http/api/factors_api.go
index bc5128a..ac12283 100644
--- a/pkg/internal/server/api/factors_api.go
+++ b/pkg/internal/http/api/factors_api.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"fmt"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/index.go b/pkg/internal/http/api/index.go
similarity index 100%
rename from pkg/internal/server/api/index.go
rename to pkg/internal/http/api/index.go
diff --git a/pkg/internal/server/api/notifications_api.go b/pkg/internal/http/api/notifications_api.go
similarity index 98%
rename from pkg/internal/server/api/notifications_api.go
rename to pkg/internal/http/api/notifications_api.go
index 304230a..b6ddb1c 100644
--- a/pkg/internal/server/api/notifications_api.go
+++ b/pkg/internal/http/api/notifications_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
diff --git a/pkg/internal/server/api/notify_api.go b/pkg/internal/http/api/notify_api.go
similarity index 96%
rename from pkg/internal/server/api/notify_api.go
rename to pkg/internal/http/api/notify_api.go
index 65213df..03b73c9 100644
--- a/pkg/internal/server/api/notify_api.go
+++ b/pkg/internal/http/api/notify_api.go
@@ -3,8 +3,8 @@ package api
 import (
 	"fmt"
 
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/oauth_api.go b/pkg/internal/http/api/oauth_api.go
similarity index 98%
rename from pkg/internal/server/api/oauth_api.go
rename to pkg/internal/http/api/oauth_api.go
index ec5fcde..04cd938 100755
--- a/pkg/internal/server/api/oauth_api.go
+++ b/pkg/internal/http/api/oauth_api.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
diff --git a/pkg/internal/server/api/preferences_api.go b/pkg/internal/http/api/preferences_api.go
similarity index 96%
rename from pkg/internal/server/api/preferences_api.go
rename to pkg/internal/http/api/preferences_api.go
index aca5c76..34bd73c 100644
--- a/pkg/internal/server/api/preferences_api.go
+++ b/pkg/internal/http/api/preferences_api.go
@@ -1,8 +1,8 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/realm_members_api.go b/pkg/internal/http/api/realm_members_api.go
similarity index 98%
rename from pkg/internal/server/api/realm_members_api.go
rename to pkg/internal/http/api/realm_members_api.go
index 7c16361..f8793c5 100644
--- a/pkg/internal/server/api/realm_members_api.go
+++ b/pkg/internal/http/api/realm_members_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/realms_api.go b/pkg/internal/http/api/realms_api.go
similarity index 98%
rename from pkg/internal/server/api/realms_api.go
rename to pkg/internal/http/api/realms_api.go
index 7ae6b8a..ef0d39b 100644
--- a/pkg/internal/server/api/realms_api.go
+++ b/pkg/internal/http/api/realms_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
diff --git a/pkg/internal/server/api/relationships_api.go b/pkg/internal/http/api/relationships_api.go
similarity index 99%
rename from pkg/internal/server/api/relationships_api.go
rename to pkg/internal/http/api/relationships_api.go
index ca194f2..bc5be5c 100644
--- a/pkg/internal/server/api/relationships_api.go
+++ b/pkg/internal/http/api/relationships_api.go
@@ -1,8 +1,8 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
diff --git a/pkg/internal/server/api/reports_api.go b/pkg/internal/http/api/reports_api.go
similarity index 96%
rename from pkg/internal/server/api/reports_api.go
rename to pkg/internal/http/api/reports_api.go
index 434d086..1cae138 100644
--- a/pkg/internal/server/api/reports_api.go
+++ b/pkg/internal/http/api/reports_api.go
@@ -1,8 +1,8 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
diff --git a/pkg/internal/server/api/security_api.go b/pkg/internal/http/api/security_api.go
similarity index 95%
rename from pkg/internal/server/api/security_api.go
rename to pkg/internal/http/api/security_api.go
index 715c822..fdb624b 100644
--- a/pkg/internal/server/api/security_api.go
+++ b/pkg/internal/http/api/security_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"github.com/gofiber/fiber/v2"
 )
 
diff --git a/pkg/internal/server/api/sign_api.go b/pkg/internal/http/api/sign_api.go
similarity index 97%
rename from pkg/internal/server/api/sign_api.go
rename to pkg/internal/http/api/sign_api.go
index 69bd3c1..1747878 100644
--- a/pkg/internal/server/api/sign_api.go
+++ b/pkg/internal/http/api/sign_api.go
@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
diff --git a/pkg/internal/server/api/statuses_api.go b/pkg/internal/http/api/statuses_api.go
similarity index 98%
rename from pkg/internal/server/api/statuses_api.go
rename to pkg/internal/http/api/statuses_api.go
index e8d3725..2002131 100644
--- a/pkg/internal/server/api/statuses_api.go
+++ b/pkg/internal/http/api/statuses_api.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/exts"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
diff --git a/pkg/internal/server/api/userinfo_api.go b/pkg/internal/http/api/userinfo_api.go
similarity index 100%
rename from pkg/internal/server/api/userinfo_api.go
rename to pkg/internal/http/api/userinfo_api.go
diff --git a/pkg/internal/server/api/well_known_api.go b/pkg/internal/http/api/well_known_api.go
similarity index 100%
rename from pkg/internal/server/api/well_known_api.go
rename to pkg/internal/http/api/well_known_api.go
diff --git a/pkg/internal/server/exts/auth.go b/pkg/internal/http/exts/auth.go
similarity index 100%
rename from pkg/internal/server/exts/auth.go
rename to pkg/internal/http/exts/auth.go
diff --git a/pkg/internal/server/exts/request.go b/pkg/internal/http/exts/request.go
similarity index 100%
rename from pkg/internal/server/exts/request.go
rename to pkg/internal/http/exts/request.go
diff --git a/pkg/internal/server/server.go b/pkg/internal/http/server.go
similarity index 82%
rename from pkg/internal/server/server.go
rename to pkg/internal/http/server.go
index 51f4c73..ea53d08 100644
--- a/pkg/internal/server/server.go
+++ b/pkg/internal/http/server.go
@@ -1,11 +1,11 @@
-package server
+package http
 
 import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strings"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/admin"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server/api"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/admin"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/api"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/idempotency"
@@ -15,13 +15,13 @@ import (
 	"github.com/spf13/viper"
 )
 
-type HTTPApp struct {
+type App struct {
 	app *fiber.App
 }
 
 var IReader *sec.InternalTokenReader
 
-func NewServer() *HTTPApp {
+func NewServer() *App {
 	app := fiber.New(fiber.Config{
 		DisableStartupMessage: true,
 		EnableIPValidation:    true,
@@ -60,11 +60,11 @@ func NewServer() *HTTPApp {
 	admin.MapAdminAPIs(app, "/api/admin")
 	api.MapAPIs(app, "/api")
 
-	return &HTTPApp{app}
+	return &App{app}
 }
 
-func (v *HTTPApp) Listen() {
+func (v *App) Listen() {
 	if err := v.app.Listen(viper.GetString("bind")); err != nil {
-		log.Fatal().Err(err).Msg("An error occurred when starting server...")
+		log.Fatal().Err(err).Msg("An error occurred when starting http...")
 	}
 }
diff --git a/pkg/main.go b/pkg/main.go
index 2201bcf..c246613 100644
--- a/pkg/main.go
+++ b/pkg/main.go
@@ -12,7 +12,7 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/gap"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/grpc"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/server"
+	"git.solsynth.dev/hydrogen/passport/pkg/internal/http"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/robfig/cron/v3"
 
@@ -55,7 +55,7 @@ func main() {
 	if reader, err := sec.NewInternalTokenReader(viper.GetString("security.internal_public_key")); err != nil {
 		log.Error().Err(err).Msg("An error occurred when reading internal public key for jwt. Authentication related features will be disabled.")
 	} else {
-		server.IReader = reader
+		http.IReader = reader
 		log.Info().Msg("Internal jwt public key loaded.")
 	}
 
@@ -71,10 +71,10 @@ func main() {
 		log.Fatal().Err(err).Msg("An error occurred when initializing cache.")
 	}
 
-	// Server
-	go server.NewServer().Listen()
+	// App
+	go http.NewServer().Listen()
 
-	// Grpc Server
+	// Grpc App
 	go grpc.NewServer().Listen()
 
 	// Configure timed tasks
diff --git a/pkg/proto/notify_grpc.pb.go b/pkg/proto/notify_grpc.pb.go
index e60425c..e93e12e 100644
--- a/pkg/proto/notify_grpc.pb.go
+++ b/pkg/proto/notify_grpc.pb.go
@@ -71,7 +71,7 @@ func (c *notifierClient) NotifyAllUser(ctx context.Context, in *NotifyRequest, o
 	return out, nil
 }
 
-// NotifierServer is the server API for Notifier service.
+// NotifierServer is the http API for Notifier service.
 // All implementations must embed UnimplementedNotifierServer
 // for forward compatibility.
 type NotifierServer interface {
diff --git a/pkg/proto/realm_grpc.pb.go b/pkg/proto/realm_grpc.pb.go
index a529c4f..96bf504 100644
--- a/pkg/proto/realm_grpc.pb.go
+++ b/pkg/proto/realm_grpc.pb.go
@@ -119,7 +119,7 @@ func (c *realmClient) CheckRealmMemberPerm(ctx context.Context, in *CheckRealmPe
 	return out, nil
 }
 
-// RealmServer is the server API for Realm service.
+// RealmServer is the http API for Realm service.
 // All implementations must embed UnimplementedRealmServer
 // for forward compatibility.
 type RealmServer interface {
diff --git a/pkg/proto/record_grpc.pb.go b/pkg/proto/record_grpc.pb.go
index 7408600..f784a98 100644
--- a/pkg/proto/record_grpc.pb.go
+++ b/pkg/proto/record_grpc.pb.go
@@ -47,7 +47,7 @@ func (c *eventRecorderClient) RecordEvent(ctx context.Context, in *RecordEventRe
 	return out, nil
 }
 
-// EventRecorderServer is the server API for EventRecorder service.
+// EventRecorderServer is the http API for EventRecorder service.
 // All implementations must embed UnimplementedEventRecorderServer
 // for forward compatibility.
 type EventRecorderServer interface {
diff --git a/settings.toml b/settings.toml
index 6b01647..b561e64 100644
--- a/settings.toml
+++ b/settings.toml
@@ -1,8 +1,8 @@
 id = "passport01"
 name = "Solarpass"
 
-bind = "0.0.0.0:8444"
-grpc_bind = "0.0.0.0:7444"
+bind = "0.0.0.0:8003"
+grpc_bind = "0.0.0.0:7003"
 domain = "id.solsynth.dev"
 
 frontend_app = "https://solsynth.dev"