diff --git a/server/internal/command/appcmd/appcmd.go b/server/internal/command/appcmd/appcmd.go
index 197ce595..10f110aa 100644
--- a/server/internal/command/appcmd/appcmd.go
+++ b/server/internal/command/appcmd/appcmd.go
@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/shroff/phylum/server/internal/core/app"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/db"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/server/internal/command/appcmd/storage.go b/server/internal/command/appcmd/storage.go
index 88278f9a..f7503e20 100644
--- a/server/internal/command/appcmd/storage.go
+++ b/server/internal/command/appcmd/storage.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/server/internal/command/command.go b/server/internal/command/command.go
index 00fac331..07e1a823 100644
--- a/server/internal/command/command.go
+++ b/server/internal/command/command.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/shroff/phylum/server/internal/command/appcmd"
 	"github.com/shroff/phylum/server/internal/command/fs"
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/server/internal/command/fs/cmd.go b/server/internal/command/fs/cmd.go
index 1af73b5e..4094cf1d 100644
--- a/server/internal/command/fs/cmd.go
+++ b/server/internal/command/fs/cmd.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/shroff/phylum/server/internal/core/app"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/server/internal/command/schema.go b/server/internal/command/schema.go
index ce852b4a..2efdd83d 100644
--- a/server/internal/command/schema.go
+++ b/server/internal/command/schema.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/spf13/cobra"
 )
 
diff --git a/server/internal/core/app/app.go b/server/internal/core/app/app.go
index a1ba5de3..bcdf8314 100644
--- a/server/internal/core/app/app.go
+++ b/server/internal/core/app/app.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 )
 
 const defaultUserUsername = "phylum"
diff --git a/server/internal/core/app/auth.go b/server/internal/core/app/auth.go
index b5a956bf..1c257e81 100644
--- a/server/internal/core/app/auth.go
+++ b/server/internal/core/app/auth.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/errors"
-	"github.com/shroff/phylum/server/internal/db"
 	"golang.org/x/exp/rand"
 )
 
diff --git a/server/internal/core/app/user_manager.go b/server/internal/core/app/user_manager.go
index 0898e44d..7feaf317 100644
--- a/server/internal/core/app/user_manager.go
+++ b/server/internal/core/app/user_manager.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/errors"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
 )
 
 var ErrUserNotFound = errors.NewError(http.StatusNotFound, "user_not_found", "no such user")
diff --git a/server/internal/db/access_tokens.sql.go b/server/internal/core/db/access_tokens.sql.go
similarity index 100%
rename from server/internal/db/access_tokens.sql.go
rename to server/internal/core/db/access_tokens.sql.go
diff --git a/server/internal/db/copyfrom.go b/server/internal/core/db/copyfrom.go
similarity index 100%
rename from server/internal/db/copyfrom.go
rename to server/internal/core/db/copyfrom.go
diff --git a/server/internal/db/db.go b/server/internal/core/db/db.go
similarity index 100%
rename from server/internal/db/db.go
rename to server/internal/core/db/db.go
diff --git a/server/internal/db/db_handler.go b/server/internal/core/db/db_handler.go
similarity index 96%
rename from server/internal/db/db_handler.go
rename to server/internal/core/db/db_handler.go
index 5663d8dc..79841c4e 100644
--- a/server/internal/db/db_handler.go
+++ b/server/internal/core/db/db_handler.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/shroff/phylum/server/internal/db/migrations"
+	"github.com/shroff/phylum/server/internal/core/db/migrations"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/internal/db/migrations/data/001_resources.sql b/server/internal/core/db/migrations/data/001_resources.sql
similarity index 100%
rename from server/internal/db/migrations/data/001_resources.sql
rename to server/internal/core/db/migrations/data/001_resources.sql
diff --git a/server/internal/db/migrations/data/002_users.sql b/server/internal/core/db/migrations/data/002_users.sql
similarity index 100%
rename from server/internal/db/migrations/data/002_users.sql
rename to server/internal/core/db/migrations/data/002_users.sql
diff --git a/server/internal/db/migrations/data/003_storage_backends.sql b/server/internal/core/db/migrations/data/003_storage_backends.sql
similarity index 100%
rename from server/internal/db/migrations/data/003_storage_backends.sql
rename to server/internal/core/db/migrations/data/003_storage_backends.sql
diff --git a/server/internal/db/migrations/data/004_access_tokens.sql b/server/internal/core/db/migrations/data/004_access_tokens.sql
similarity index 100%
rename from server/internal/db/migrations/data/004_access_tokens.sql
rename to server/internal/core/db/migrations/data/004_access_tokens.sql
diff --git a/server/internal/db/migrations/data/005_permissions.sql b/server/internal/core/db/migrations/data/005_permissions.sql
similarity index 100%
rename from server/internal/db/migrations/data/005_permissions.sql
rename to server/internal/core/db/migrations/data/005_permissions.sql
diff --git a/server/internal/db/migrations/migrations.go b/server/internal/core/db/migrations/migrations.go
similarity index 100%
rename from server/internal/db/migrations/migrations.go
rename to server/internal/core/db/migrations/migrations.go
diff --git a/server/internal/db/models.go b/server/internal/core/db/models.go
similarity index 100%
rename from server/internal/db/models.go
rename to server/internal/core/db/models.go
diff --git a/server/internal/db/permissions.sql.go b/server/internal/core/db/permissions.sql.go
similarity index 100%
rename from server/internal/db/permissions.sql.go
rename to server/internal/core/db/permissions.sql.go
diff --git a/server/internal/db/resources.sql.go b/server/internal/core/db/resources.sql.go
similarity index 100%
rename from server/internal/db/resources.sql.go
rename to server/internal/core/db/resources.sql.go
diff --git a/server/internal/db/schema.go b/server/internal/core/db/schema.go
similarity index 96%
rename from server/internal/db/schema.go
rename to server/internal/core/db/schema.go
index a19c85a5..04ed025e 100644
--- a/server/internal/db/schema.go
+++ b/server/internal/core/db/schema.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/shroff/phylum/server/internal/db/migrations"
+	"github.com/shroff/phylum/server/internal/core/db/migrations"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/internal/db/storage_backends.sql.go b/server/internal/core/db/storage_backends.sql.go
similarity index 100%
rename from server/internal/db/storage_backends.sql.go
rename to server/internal/core/db/storage_backends.sql.go
diff --git a/server/internal/db/tracer.go b/server/internal/core/db/tracer.go
similarity index 100%
rename from server/internal/db/tracer.go
rename to server/internal/core/db/tracer.go
diff --git a/server/internal/db/users.sql.go b/server/internal/core/db/users.sql.go
similarity index 100%
rename from server/internal/db/users.sql.go
rename to server/internal/core/db/users.sql.go
diff --git a/server/internal/core/fs/filesystem.go b/server/internal/core/fs/filesystem.go
index ebeb5c37..27d07296 100644
--- a/server/internal/core/fs/filesystem.go
+++ b/server/internal/core/fs/filesystem.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/db"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/internal/storage/io.go b/server/internal/core/storage/io.go
similarity index 100%
rename from server/internal/storage/io.go
rename to server/internal/core/storage/io.go
diff --git a/server/internal/storage/local_storage.go b/server/internal/core/storage/local_storage.go
similarity index 100%
rename from server/internal/storage/local_storage.go
rename to server/internal/core/storage/local_storage.go
diff --git a/server/internal/storage/minio_storage.go b/server/internal/core/storage/minio_storage.go
similarity index 100%
rename from server/internal/storage/minio_storage.go
rename to server/internal/core/storage/minio_storage.go
diff --git a/server/internal/storage/storage.go b/server/internal/core/storage/storage.go
similarity index 98%
rename from server/internal/storage/storage.go
rename to server/internal/core/storage/storage.go
index 4ef4ccf9..a6c218b0 100644
--- a/server/internal/storage/storage.go
+++ b/server/internal/core/storage/storage.go
@@ -8,7 +8,7 @@ import (
 	"io"
 
 	"github.com/google/uuid"
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 )
 
 type Storage interface {
diff --git a/server/internal/storage/storage_backend.go b/server/internal/core/storage/storage_backend.go
similarity index 100%
rename from server/internal/storage/storage_backend.go
rename to server/internal/core/storage/storage_backend.go
diff --git a/server/sqlc.yml b/server/sqlc.yml
index 9cf3c9f0..7ee2a6ee 100644
--- a/server/sqlc.yml
+++ b/server/sqlc.yml
@@ -2,11 +2,11 @@ version: "2"
 sql:
   - engine: "postgresql"
     queries: "sql/queries"
-    schema: "internal/db/migrations/data"
+    schema: "internal/core/db/migrations/data"
     gen:
       go:
         package: "db"
-        out: "internal/db"
+        out: "internal/core/db"
         sql_package: "pgx/v5"
         overrides:
           - db_type: "uuid"