diff --git a/server/internal/handlers/item.go b/server/internal/handlers/item/v1/item.go
similarity index 99%
rename from server/internal/handlers/item.go
rename to server/internal/handlers/item/v1/item.go
index 5d8acd7..cea8430 100644
--- a/server/internal/handlers/item.go
+++ b/server/internal/handlers/item/v1/item.go
@@ -1,4 +1,4 @@
-package handlers
+package item
 
 import (
 	"context"
diff --git a/server/internal/handlers/auth.go b/server/internal/handlers/user/v1/auth.go
similarity index 99%
rename from server/internal/handlers/auth.go
rename to server/internal/handlers/user/v1/auth.go
index af9f0bf..1ceab2b 100644
--- a/server/internal/handlers/auth.go
+++ b/server/internal/handlers/user/v1/auth.go
@@ -1,4 +1,4 @@
-package handlers
+package user
 
 import (
 	"context"
diff --git a/server/internal/handlers/user.go b/server/internal/handlers/user/v1/user.go
similarity index 99%
rename from server/internal/handlers/user.go
rename to server/internal/handlers/user/v1/user.go
index f0ea7ac..a81fb64 100644
--- a/server/internal/handlers/user.go
+++ b/server/internal/handlers/user/v1/user.go
@@ -1,4 +1,4 @@
-package handlers
+package user
 
 import (
 	"context"
diff --git a/server/main.go b/server/main.go
index edc867e..0bb0272 100644
--- a/server/main.go
+++ b/server/main.go
@@ -1,3 +1,4 @@
+// TrevStack HTTP Server
 package main
 
 import (
@@ -20,6 +21,8 @@ import (
 	"github.com/spotdemo4/trevstack/server/internal/database"
 	"github.com/spotdemo4/trevstack/server/internal/handlers"
 	"github.com/spotdemo4/trevstack/server/internal/handlers/client"
+	"github.com/spotdemo4/trevstack/server/internal/handlers/item/v1"
+	"github.com/spotdemo4/trevstack/server/internal/handlers/user/v1"
 )
 
 type env struct {
@@ -107,9 +110,9 @@ func main() {
 
 	// Serve GRPC Handlers
 	api := http.NewServeMux()
-	api.Handle(withCORS(handlers.NewAuthHandler(db, env.Key)))
-	api.Handle(withCORS(handlers.NewUserHandler(db, env.Key)))
-	api.Handle(withCORS(handlers.NewItemHandler(db, env.Key)))
+	api.Handle(withCORS(user.NewAuthHandler(db, env.Key)))
+	api.Handle(withCORS(user.NewUserHandler(db, env.Key)))
+	api.Handle(withCORS(item.NewItemHandler(db, env.Key)))
 
 	// Serve web interface
 	mux := http.NewServeMux()