diff --git a/internal/service/character.go b/internal/service/character.go
index 0c226366e..61a16e992 100644
--- a/internal/service/character.go
+++ b/internal/service/character.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/config"
 	"erupe-ce/server/channelserver/compression/nullcomp"
 	"erupe-ce/utils/bfutil"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 	"erupe-ce/utils/stringsupport"
 	"fmt"
@@ -120,7 +120,7 @@ func getPointers() map[SavePointer]int {
 }
 
 func GetCharacterSaveData(charID uint32) (*CharacterSaveData, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 	if err != nil {
 		logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -169,7 +169,7 @@ type SessionCharacter interface {
 }
 
 func (save *CharacterSaveData) Save(s SessionCharacter) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
diff --git a/internal/service/guild.go b/internal/service/guild.go
index 5474ae518..0def60cf1 100644
--- a/internal/service/guild.go
+++ b/internal/service/guild.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"erupe-ce/config"
 	"erupe-ce/internal/model"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 	"fmt"
 	"time"
@@ -106,7 +106,7 @@ func (g *Guild) Rank() uint16 {
 }
 
 func (guild *Guild) Save() error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -127,7 +127,7 @@ func (guild *Guild) Save() error {
 }
 
 func (guild *Guild) CreateApplication(charID uint32, applicationType model.GuildApplicationType, transaction *sql.Tx, actorId uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -158,7 +158,7 @@ func (guild *Guild) CreateApplication(charID uint32, applicationType model.Guild
 }
 
 func (guild *Guild) Disband(charID uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -224,7 +224,7 @@ func (guild *Guild) Disband(charID uint32) error {
 }
 
 func (guild *Guild) RemoveCharacter(charID uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -247,7 +247,7 @@ func (guild *Guild) RemoveCharacter(charID uint32) error {
 }
 
 func (guild *Guild) AcceptApplication(charID uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -298,7 +298,7 @@ func (guild *Guild) AcceptApplication(charID uint32) error {
 // This is relying on the fact that invitation ID is also character ID right now
 // if invitation ID changes, this will break.
 func (guild *Guild) CancelInvitation(charID uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -323,7 +323,7 @@ func (guild *Guild) CancelInvitation(charID uint32) error {
 }
 
 func (guild *Guild) RejectApplication(charID uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -348,7 +348,7 @@ func (guild *Guild) RejectApplication(charID uint32) error {
 }
 
 func (guild *Guild) ArrangeCharacters(charIDs []uint32) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -386,7 +386,7 @@ func (guild *Guild) ArrangeCharacters(charIDs []uint32) error {
 }
 
 func (guild *Guild) GetApplicationForCharID(charID uint32, applicationType model.GuildApplicationType) (*model.GuildApplication, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -418,7 +418,7 @@ func (guild *Guild) GetApplicationForCharID(charID uint32, applicationType model
 }
 
 func (guild *Guild) HasApplicationForCharID(charID uint32) (bool, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -487,7 +487,7 @@ SELECT
 `
 
 func CreateGuild(guildName string, charID uint32) (int32, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -557,7 +557,7 @@ func CreateGuild(guildName string, charID uint32) (int32, error) {
 }
 
 func GetGuildInfoByID(guildID uint32) (*Guild, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -586,7 +586,7 @@ func GetGuildInfoByID(guildID uint32) (*Guild, error) {
 }
 
 func GetGuildInfoByCharacterId(charID uint32) (*Guild, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
diff --git a/internal/service/guild_alliance.go b/internal/service/guild_alliance.go
index 517b71fb4..82de93f4f 100644
--- a/internal/service/guild_alliance.go
+++ b/internal/service/guild_alliance.go
@@ -1,7 +1,7 @@
 package service
 
 import (
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 	"fmt"
 	"time"
@@ -43,7 +43,7 @@ FROM guild_alliances ga
 `
 
 func GetAllianceData(AllianceID uint32) (*GuildAlliance, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
diff --git a/internal/service/guild_member.go b/internal/service/guild_member.go
index 5b6065a0f..54e20e416 100644
--- a/internal/service/guild_member.go
+++ b/internal/service/guild_member.go
@@ -1,7 +1,7 @@
 package service
 
 import (
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 	"fmt"
 	"time"
@@ -48,7 +48,7 @@ func (gm *GuildMember) IsSubLeader() bool {
 }
 
 func (gm *GuildMember) Save() error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -95,7 +95,7 @@ SELECT * FROM (
 `
 
 func GetGuildMembers(guildID uint32, applicants bool) ([]*GuildMember, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -129,7 +129,7 @@ func GetGuildMembers(guildID uint32, applicants bool) ([]*GuildMember, error) {
 }
 
 func GetCharacterGuildData(charID uint32) (*GuildMember, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
diff --git a/internal/service/mail.go b/internal/service/mail.go
index 684e988c6..d3a3aa681 100644
--- a/internal/service/mail.go
+++ b/internal/service/mail.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 
 	"erupe-ce/utils/logger"
 	"fmt"
@@ -34,7 +34,7 @@ type Mail struct {
 }
 
 func (m *Mail) Send(transaction *sql.Tx) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -71,7 +71,7 @@ func (m *Mail) Send(transaction *sql.Tx) error {
 }
 
 func (m *Mail) MarkRead() error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 	if err != nil {
 		logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -93,7 +93,7 @@ func (m *Mail) MarkRead() error {
 }
 
 func GetMailListForCharacter(charID uint32) ([]Mail, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 	if err != nil {
 		logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -146,7 +146,7 @@ func GetMailListForCharacter(charID uint32) ([]Mail, error) {
 }
 
 func GetMailByID(ID int) (*Mail, error) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
@@ -217,7 +217,7 @@ func SendMailNotification(s SessionMail, m *Mail, recipient SessionMail) {
 }
 
 func getCharacterName(charID uint32) string {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	logger := logger.Get()
 
 	if err != nil {
diff --git a/main.go b/main.go
index 7da52a3e4..e4ba5aa47 100644
--- a/main.go
+++ b/main.go
@@ -15,7 +15,7 @@ import (
 	"erupe-ce/server/discordbot"
 	"erupe-ce/server/entrance"
 	"erupe-ce/server/sign"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 
 	"erupe-ce/utils/gametime"
@@ -61,7 +61,7 @@ func main() {
 
 	discordBot := initializeDiscordBot()
 
-	database, err := db.InitDB(config)
+	database, err := database.InitDB(config)
 	if err != nil {
 		mainLogger.Fatal(fmt.Sprintf("Database initialization failed: %s", err))
 	}
diff --git a/server/api/dbutils.go b/server/api/dbutils.go
index fce7744a0..c2fa59f36 100644
--- a/server/api/dbutils.go
+++ b/server/api/dbutils.go
@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"database/sql"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/token"
 	"fmt"
 	"time"
@@ -22,7 +22,7 @@ func (s *APIServer) createNewUser(ctx context.Context, username string, password
 		id     uint32
 		rights uint32
 	)
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -40,7 +40,7 @@ func (s *APIServer) createNewUser(ctx context.Context, username string, password
 func (s *APIServer) createLoginToken(ctx context.Context, uid uint32) (uint32, string, error) {
 	loginToken := token.Generate(16)
 	var tid uint32
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -53,7 +53,7 @@ func (s *APIServer) createLoginToken(ctx context.Context, uid uint32) (uint32, s
 
 func (s *APIServer) userIDFromToken(ctx context.Context, token string) (uint32, error) {
 	var userID uint32
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -68,7 +68,7 @@ func (s *APIServer) userIDFromToken(ctx context.Context, token string) (uint32,
 
 func (s *APIServer) createCharacter(ctx context.Context, userID uint32) (Character, error) {
 	var character Character
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -97,7 +97,7 @@ func (s *APIServer) createCharacter(ctx context.Context, userID uint32) (Charact
 
 func (s *APIServer) deleteCharacter(ctx context.Context, userID uint32, charID uint32) error {
 	var isNew bool
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -115,7 +115,7 @@ func (s *APIServer) deleteCharacter(ctx context.Context, userID uint32, charID u
 
 func (s *APIServer) getCharactersForUser(ctx context.Context, uid uint32) ([]Character, error) {
 	var characters []Character
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -134,7 +134,7 @@ func (s *APIServer) getCharactersForUser(ctx context.Context, uid uint32) ([]Cha
 
 func (s *APIServer) getReturnExpiry(uid uint32) time.Time {
 	var returnExpiry, lastLogin time.Time
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -154,7 +154,7 @@ func (s *APIServer) getReturnExpiry(uid uint32) time.Time {
 }
 
 func (s *APIServer) exportSave(ctx context.Context, uid uint32, cid uint32) (map[string]interface{}, error) {
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/api/endpoints.go b/server/api/endpoints.go
index bc425dce5..dafbe8101 100644
--- a/server/api/endpoints.go
+++ b/server/api/endpoints.go
@@ -6,7 +6,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"erupe-ce/config"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"fmt"
 	"image"
@@ -138,7 +138,7 @@ func (s *APIServer) Login(w http.ResponseWriter, r *http.Request) {
 		userRights uint32
 		password   string
 	)
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/chat_commands.go b/server/channelserver/chat_commands.go
index b3be672f8..55dd03861 100644
--- a/server/channelserver/chat_commands.go
+++ b/server/channelserver/chat_commands.go
@@ -7,7 +7,7 @@ import (
 	"erupe-ce/internal/constant"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/mhfcid"
 	"erupe-ce/utils/mhfcourse"
 	"fmt"
@@ -52,7 +52,7 @@ func executeCommand(s *Session, input string) error {
 }
 
 func ban(s *Session, args []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -103,7 +103,7 @@ func ban(s *Session, args []string) error {
 }
 
 func timer(s *Session, _ []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -119,7 +119,7 @@ func timer(s *Session, _ []string) error {
 }
 
 func psn(s *Session, args []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -219,7 +219,7 @@ func kqf(s *Session, args []string) error {
 }
 
 func rights(s *Session, args []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -239,7 +239,7 @@ func rights(s *Session, args []string) error {
 }
 
 func course(s *Session, args []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -366,7 +366,7 @@ func teleport(s *Session, args []string) error {
 }
 
 func discord(s *Session, _ []string) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go
index e6751966f..bb19b4707 100644
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/internal/model"
 	"erupe-ce/internal/service"
 	"erupe-ce/internal/system"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/mhfcourse"
 	"erupe-ce/utils/mhfitem"
@@ -38,7 +38,7 @@ func stubEnumerateNoResults(s *Session, ackHandle uint32) {
 }
 
 func updateRights(s *Session) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -143,7 +143,7 @@ func handleMsgSysLogout(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
 }
 
 func logoutPlayer(s *Session) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -788,7 +788,7 @@ func handleMsgMhfEnumerateOrder(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket)
 func handleMsgMhfGetExtraInfo(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {}
 
 func userGetItems(s *Session) []mhfitem.MHFItemStack {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -882,7 +882,7 @@ func handleMsgMhfExchangeWeeklyStamp(s *Session, db *sqlx.DB, p mhfpacket.MHFPac
 }
 
 func getGoocooData(s *Session, cid uint32) [][]byte {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_cafe.go b/server/channelserver/handlers_cafe.go
index 0ea05884b..8a1c6b1e3 100644
--- a/server/channelserver/handlers_cafe.go
+++ b/server/channelserver/handlers_cafe.go
@@ -3,7 +3,7 @@ package channelserver
 import (
 	"erupe-ce/internal/model"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/mhfcourse"
 
@@ -206,7 +206,7 @@ func handleMsgMhfPostCafeDurationBonusReceived(s *Session, db *sqlx.DB, p mhfpac
 }
 
 func addPointNetcafe(s *Session, p int) error {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go
index c33df1620..f225620d8 100644
--- a/server/channelserver/handlers_distitem.go
+++ b/server/channelserver/handlers_distitem.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/internal/service"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	ps "erupe-ce/utils/pascalstring"
 	"fmt"
 
@@ -108,7 +108,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, db *sqlx.DB, p mhfpacket.MHFPacke
 }
 
 func getDistributionItems(s *Session, i uint32) []model.DistributionItem {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_diva.go b/server/channelserver/handlers_diva.go
index eed09e236..8cf6b2353 100644
--- a/server/channelserver/handlers_diva.go
+++ b/server/channelserver/handlers_diva.go
@@ -3,7 +3,7 @@ package channelserver
 import (
 	"encoding/hex"
 	config "erupe-ce/config"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/stringsupport"
 	"fmt"
@@ -16,7 +16,7 @@ import (
 )
 
 func cleanupDiva(s *Session) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -24,7 +24,7 @@ func cleanupDiva(s *Session) {
 }
 
 func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go
index d5a366233..9216ce137 100644
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -8,7 +8,7 @@ import (
 
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 
 	"erupe-ce/utils/gametime"
 	ps "erupe-ce/utils/pascalstring"
@@ -105,7 +105,7 @@ func handleMsgMhfEnumerateRanking(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket
 }
 
 func cleanupFesta(s *Session) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -117,7 +117,7 @@ func cleanupFesta(s *Session) {
 }
 
 func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go
index 198c1af27..82680b32c 100644
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/internal/model"
 	"erupe-ce/internal/service"
 
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/mhfitem"
 
@@ -209,7 +209,7 @@ func handleChangePugi(s *Session, outfit uint8, guild *service.Guild, num int) {
 }
 
 func handleDonateRP(s *Session, amount uint16, guild *service.Guild, _type int) []byte {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -977,7 +977,7 @@ func HandleMsgMhfGetGuildTargetMemberNum(s *Session, db *sqlx.DB, p mhfpacket.MH
 }
 
 func guildGetItems(s *Session, guildID uint32) []mhfitem.MHFItemStack {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go
index a8832d565..18b9861ce 100644
--- a/server/channelserver/handlers_house.go
+++ b/server/channelserver/handlers_house.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/internal/service"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/mhfitem"
 	ps "erupe-ce/utils/pascalstring"
 	"erupe-ce/utils/stringsupport"
@@ -367,7 +367,7 @@ func handleMsgMhfAcquireTitle(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
 func handleMsgMhfResetTitle(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {}
 
 func initializeWarehouse(s *Session) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -440,7 +440,7 @@ func handleMsgMhfOperateWarehouse(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket
 }
 
 func addWarehouseItem(s *Session, item mhfitem.MHFItemStack) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -451,7 +451,7 @@ func addWarehouseItem(s *Session, item mhfitem.MHFItemStack) {
 }
 
 func addWarehouseEquipment(s *Session, equipment mhfitem.MHFEquipment) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -462,7 +462,7 @@ func addWarehouseEquipment(s *Session, equipment mhfitem.MHFEquipment) {
 }
 
 func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -482,7 +482,7 @@ func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
 }
 
 func warehouseGetEquipment(s *Session, index uint8) []mhfitem.MHFEquipment {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go
index 56e1bd74d..93a30c99a 100644
--- a/server/channelserver/handlers_mercenary.go
+++ b/server/channelserver/handlers_mercenary.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/stringsupport"
 	"io"
@@ -332,7 +332,7 @@ func handleMsgMhfEnumerateAiroulist(s *Session, db *sqlx.DB, p mhfpacket.MHFPack
 }
 
 func getGuildAirouList(s *Session) []model.Airou {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/handlers_shop_gacha.go b/server/channelserver/handlers_shop_gacha.go
index 7631a7d2a..8e78b90bc 100644
--- a/server/channelserver/handlers_shop_gacha.go
+++ b/server/channelserver/handlers_shop_gacha.go
@@ -5,7 +5,7 @@ import (
 	"erupe-ce/internal/model"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	ps "erupe-ce/utils/pascalstring"
 	"fmt"
@@ -46,7 +46,7 @@ func writeShopItems(bf *byteframe.ByteFrame, items []model.ShopItem) {
 }
 
 func getShopItems(s *Session, shopType uint8, shopID uint32) []model.ShopItem {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -276,7 +276,7 @@ func handleMsgMhfUseGachaPoint(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
 
 func spendGachaCoin(s *Session, quantity uint16) {
 
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -291,7 +291,7 @@ func spendGachaCoin(s *Session, quantity uint16) {
 }
 
 func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -326,7 +326,7 @@ func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
 }
 
 func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []model.GachaItem {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -344,7 +344,7 @@ func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []model.GachaI
 }
 
 func addGachaItem(s *Session, items []model.GachaItem) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go
index 76f554d9a..fe15dc1d8 100644
--- a/server/channelserver/sys_channel_server.go
+++ b/server/channelserver/sys_channel_server.go
@@ -9,7 +9,7 @@ import (
 	"erupe-ce/config"
 	"erupe-ce/internal/system"
 	"erupe-ce/server/discordbot"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/logger"
@@ -209,7 +209,7 @@ func (server *ChannelServer) FindSessionByCharID(charID uint32) *Session {
 func (server *ChannelServer) DisconnectUser(uid uint32) {
 	var cid uint32
 	var cids []uint32
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/sys_discord.go b/server/channelserver/sys_discord.go
index 339b48951..788b00b9c 100644
--- a/server/channelserver/sys_discord.go
+++ b/server/channelserver/sys_discord.go
@@ -1,7 +1,7 @@
 package channelserver
 
 import (
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"fmt"
 	"sort"
 	"strings"
@@ -71,7 +71,7 @@ func getCharacterList(server *ChannelServer) string {
 
 // onInteraction handles slash commands
 func (server *ChannelServer) onInteraction(ds *discordgo.Session, i *discordgo.InteractionCreate) {
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/channelserver/sys_session.go b/server/channelserver/sys_session.go
index 3293f8022..4c3ec2864 100644
--- a/server/channelserver/sys_session.go
+++ b/server/channelserver/sys_session.go
@@ -10,7 +10,7 @@ import (
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	"erupe-ce/utils/logger"
 	"erupe-ce/utils/mhfcourse"
@@ -196,7 +196,7 @@ func (s *Session) handlePacketGroup(pktGroup []byte) {
 		fmt.Printf("\n!!! [%s] %s NOT IMPLEMENTED !!! \n\n\n", s.Name, opcode)
 		return
 	}
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -314,7 +314,7 @@ func (s *Session) GetSemaphoreID() uint32 {
 
 func (s *Session) isOp() bool {
 	var op bool
-	db, err := db.GetDB()
+	db, err := database.GetDB()
 	if err != nil {
 		s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/entrance/make_resp.go b/server/entrance/make_resp.go
index 08a640e45..94ec56315 100644
--- a/server/entrance/make_resp.go
+++ b/server/entrance/make_resp.go
@@ -6,7 +6,7 @@ import (
 	"erupe-ce/config"
 	"erupe-ce/network/crypto/bin8"
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 
 	"erupe-ce/utils/stringsupport"
@@ -73,7 +73,7 @@ func encodeServerInfo(server *EntranceServer, local bool) []byte {
 			bf.WriteUint16(uint16(channelIdx | 16))
 			bf.WriteUint16(ci.MaxPlayers)
 			var currentPlayers uint16
-			database, err := db.GetDB() // Capture both return values
+			database, err := database.GetDB() // Capture both return values
 			if err != nil {
 				server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 			}
@@ -156,7 +156,7 @@ func makeUsrResp(pkt []byte, server *EntranceServer) []byte {
 	_ = bf.ReadUint8()  // 0x00
 	userEntries := bf.ReadUint16()
 	resp := byteframe.NewByteFrame()
-	database, err := db.GetDB()
+	database, err := database.GetDB()
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/sign/dbutils.go b/server/sign/dbutils.go
index 4af86c7ef..480d441cf 100644
--- a/server/sign/dbutils.go
+++ b/server/sign/dbutils.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"erupe-ce/config"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/mhfcourse"
 	"erupe-ce/utils/token"
 	"fmt"
@@ -17,7 +17,7 @@ import (
 
 func (server *SignServer) newUserChara(uid uint32) error {
 	var numNewChars int
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -49,7 +49,7 @@ func (server *SignServer) newUserChara(uid uint32) error {
 func (server *SignServer) registerDBAccount(username string, password string) (uint32, error) {
 	var uid uint32
 	server.logger.Info("Creating user", zap.String("User", username))
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -80,7 +80,7 @@ type character struct {
 }
 
 func (server *SignServer) getCharactersForUser(uid uint32) ([]character, error) {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -93,7 +93,7 @@ func (server *SignServer) getCharactersForUser(uid uint32) ([]character, error)
 }
 
 func (server *SignServer) getReturnExpiry(uid uint32) time.Time {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -114,7 +114,7 @@ func (server *SignServer) getReturnExpiry(uid uint32) time.Time {
 }
 
 func (server *SignServer) getLastCID(uid uint32) uint32 {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -124,7 +124,7 @@ func (server *SignServer) getLastCID(uid uint32) uint32 {
 }
 
 func (server *SignServer) getUserRights(uid uint32) uint32 {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -143,7 +143,7 @@ type members struct {
 }
 
 func (server *SignServer) getFriendsForCharacters(chars []character) []members {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -173,7 +173,7 @@ func (server *SignServer) getFriendsForCharacters(chars []character) []members {
 }
 
 func (server *SignServer) getGuildmatesForCharacters(chars []character) []members {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -202,7 +202,7 @@ func (server *SignServer) getGuildmatesForCharacters(chars []character) []member
 }
 
 func (server *SignServer) deleteCharacter(cid int, token string, tokenID uint32) error {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -224,7 +224,7 @@ func (server *SignServer) deleteCharacter(cid int, token string, tokenID uint32)
 
 // Unused
 func (server *SignServer) checkToken(uid uint32) (bool, error) {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -240,7 +240,7 @@ func (server *SignServer) checkToken(uid uint32) (bool, error) {
 }
 
 func (server *SignServer) registerUidToken(uid uint32) (uint32, string, error) {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -251,7 +251,7 @@ func (server *SignServer) registerUidToken(uid uint32) (uint32, string, error) {
 }
 
 func (server *SignServer) registerPsnToken(psn string) (uint32, string, error) {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -262,7 +262,7 @@ func (server *SignServer) registerPsnToken(psn string) (uint32, string, error) {
 }
 
 func (server *SignServer) validateToken(token string, tokenID uint32) bool {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -279,7 +279,7 @@ func (server *SignServer) validateToken(token string, tokenID uint32) bool {
 }
 
 func (server *SignServer) validateLogin(user string, pass string) (uint32, RespID) {
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/sign/dsgn_resp.go b/server/sign/dsgn_resp.go
index cd6b24741..665a2b9e6 100644
--- a/server/sign/dsgn_resp.go
+++ b/server/sign/dsgn_resp.go
@@ -2,7 +2,7 @@ package sign
 
 import (
 	"erupe-ce/utils/byteframe"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/gametime"
 	ps "erupe-ce/utils/pascalstring"
 	"erupe-ce/utils/stringsupport"
@@ -333,7 +333,7 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 
 	bf.WriteUint16(uint16(len(filters.Data())))
 	bf.WriteBytes(filters.Data())
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/server/sign/session.go b/server/sign/session.go
index 2b437e9dd..9e05ebb1a 100644
--- a/server/sign/session.go
+++ b/server/sign/session.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"erupe-ce/config"
-	"erupe-ce/utils/db"
+	"erupe-ce/utils/database"
 	"erupe-ce/utils/logger"
 
 	"erupe-ce/utils/stringsupport"
@@ -121,7 +121,7 @@ func (s *Session) handleWIIUSGN(bf *byteframe.ByteFrame) {
 	_ = bf.ReadBytes(1)
 	wiiuKey := string(bf.ReadBytes(64))
 	var uid uint32
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -152,7 +152,7 @@ func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) {
 	}
 	s.psn = string(bf.ReadNullTerminatedBytes())
 	var uid uint32
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
@@ -173,7 +173,7 @@ func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) {
 	credentials := strings.Split(stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()), "\n")
 	token := string(bf.ReadNullTerminatedBytes())
 	uid, resp := s.server.validateLogin(credentials[0], credentials[1])
-	database, err := db.GetDB() // Capture both return values
+	database, err := database.GetDB() // Capture both return values
 	if err != nil {
 		s.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
 	}
diff --git a/utils/db/db.go b/utils/database/db.go
similarity index 99%
rename from utils/db/db.go
rename to utils/database/db.go
index 7ccc9d6a0..52e569dc4 100644
--- a/utils/db/db.go
+++ b/utils/database/db.go
@@ -1,4 +1,4 @@
-package db
+package database
 
 import (
 	"fmt"