diff --git a/server/internal/api/routes.go b/server/internal/api/routes.go
index af4df5b..ce8d4c3 100644
--- a/server/internal/api/routes.go
+++ b/server/internal/api/routes.go
@@ -12,11 +12,11 @@ import (
 )
 
 // SetupRoutes configures the API routes
-func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.Storage, authMiddleware *auth.Middleware, sessionService *auth.SessionService) {
+func SetupRoutes(r chi.Router, db *db.DB, s *filesystem.Storage, authMiddleware *auth.Middleware, sessionService *auth.SessionService) {
 
 	handler := &handlers.Handler{
 		DB: db,
-		FS: fs,
+		S:  s,
 	}
 
 	// Public routes (no authentication required)
diff --git a/server/internal/handlers/admin_handlers.go b/server/internal/handlers/admin_handlers.go
index 3a212bc..f861e5a 100644
--- a/server/internal/handlers/admin_handlers.go
+++ b/server/internal/handlers/admin_handlers.go
@@ -91,7 +91,7 @@ func (h *Handler) AdminCreateUser() http.HandlerFunc {
 		}
 
 		// Initialize user workspace
-		if err := h.FS.InitializeUserWorkspace(insertedUser.ID, insertedUser.LastWorkspaceID); err != nil {
+		if err := h.S.InitializeUserWorkspace(insertedUser.ID, insertedUser.LastWorkspaceID); err != nil {
 			http.Error(w, "Failed to initialize user workspace", http.StatusInternalServerError)
 			return
 		}
@@ -248,7 +248,7 @@ func (h *Handler) AdminListWorkspaces() http.HandlerFunc {
 			workspaceData.WorkspaceName = ws.Name
 			workspaceData.WorkspaceCreatedAt = ws.CreatedAt
 
-			fileStats, err := h.FS.GetFileStats(ws.UserID, ws.ID)
+			fileStats, err := h.S.GetFileStats(ws.UserID, ws.ID)
 			if err != nil {
 				http.Error(w, "Failed to get file stats", http.StatusInternalServerError)
 				return
@@ -278,7 +278,7 @@ func (h *Handler) AdminGetSystemStats() http.HandlerFunc {
 			return
 		}
 
-		fileStats, err := h.FS.GetTotalFileStats()
+		fileStats, err := h.S.GetTotalFileStats()
 		if err != nil {
 			http.Error(w, "Failed to get file stats", http.StatusInternalServerError)
 			return
diff --git a/server/internal/handlers/file_handlers.go b/server/internal/handlers/file_handlers.go
index 4af815a..3e23772 100644
--- a/server/internal/handlers/file_handlers.go
+++ b/server/internal/handlers/file_handlers.go
@@ -17,7 +17,7 @@ func (h *Handler) ListFiles() http.HandlerFunc {
 			return
 		}
 
-		files, err := h.FS.ListFilesRecursively(ctx.UserID, ctx.Workspace.ID)
+		files, err := h.S.ListFilesRecursively(ctx.UserID, ctx.Workspace.ID)
 		if err != nil {
 			http.Error(w, "Failed to list files", http.StatusInternalServerError)
 			return
@@ -40,7 +40,7 @@ func (h *Handler) LookupFileByName() http.HandlerFunc {
 			return
 		}
 
-		filePaths, err := h.FS.FindFileByName(ctx.UserID, ctx.Workspace.ID, filename)
+		filePaths, err := h.S.FindFileByName(ctx.UserID, ctx.Workspace.ID, filename)
 		if err != nil {
 			http.Error(w, "File not found", http.StatusNotFound)
 			return
@@ -58,7 +58,7 @@ func (h *Handler) GetFileContent() http.HandlerFunc {
 		}
 
 		filePath := chi.URLParam(r, "*")
-		content, err := h.FS.GetFileContent(ctx.UserID, ctx.Workspace.ID, filePath)
+		content, err := h.S.GetFileContent(ctx.UserID, ctx.Workspace.ID, filePath)
 		if err != nil {
 			http.Error(w, "Failed to read file", http.StatusNotFound)
 			return
@@ -83,7 +83,7 @@ func (h *Handler) SaveFile() http.HandlerFunc {
 			return
 		}
 
-		err = h.FS.SaveFile(ctx.UserID, ctx.Workspace.ID, filePath, content)
+		err = h.S.SaveFile(ctx.UserID, ctx.Workspace.ID, filePath, content)
 		if err != nil {
 			http.Error(w, "Failed to save file", http.StatusInternalServerError)
 			return
@@ -101,7 +101,7 @@ func (h *Handler) DeleteFile() http.HandlerFunc {
 		}
 
 		filePath := chi.URLParam(r, "*")
-		err := h.FS.DeleteFile(ctx.UserID, ctx.Workspace.ID, filePath)
+		err := h.S.DeleteFile(ctx.UserID, ctx.Workspace.ID, filePath)
 		if err != nil {
 			http.Error(w, "Failed to delete file", http.StatusInternalServerError)
 			return
@@ -125,7 +125,7 @@ func (h *Handler) GetLastOpenedFile() http.HandlerFunc {
 			return
 		}
 
-		if _, err := h.FS.ValidatePath(ctx.UserID, ctx.Workspace.ID, filePath); err != nil {
+		if _, err := h.S.ValidatePath(ctx.UserID, ctx.Workspace.ID, filePath); err != nil {
 			http.Error(w, "Invalid file path", http.StatusBadRequest)
 			return
 		}
@@ -152,7 +152,7 @@ func (h *Handler) UpdateLastOpenedFile() http.HandlerFunc {
 
 		// Validate the file path exists in the workspace
 		if requestBody.FilePath != "" {
-			if _, err := h.FS.ValidatePath(ctx.UserID, ctx.Workspace.ID, requestBody.FilePath); err != nil {
+			if _, err := h.S.ValidatePath(ctx.UserID, ctx.Workspace.ID, requestBody.FilePath); err != nil {
 				http.Error(w, "Invalid file path", http.StatusBadRequest)
 				return
 			}
diff --git a/server/internal/handlers/git_handlers.go b/server/internal/handlers/git_handlers.go
index 61f7ba4..2836d35 100644
--- a/server/internal/handlers/git_handlers.go
+++ b/server/internal/handlers/git_handlers.go
@@ -28,7 +28,7 @@ func (h *Handler) StageCommitAndPush() http.HandlerFunc {
 			return
 		}
 
-		err := h.FS.StageCommitAndPush(ctx.UserID, ctx.Workspace.ID, requestBody.Message)
+		err := h.S.StageCommitAndPush(ctx.UserID, ctx.Workspace.ID, requestBody.Message)
 		if err != nil {
 			http.Error(w, "Failed to stage, commit, and push changes: "+err.Error(), http.StatusInternalServerError)
 			return
@@ -45,7 +45,7 @@ func (h *Handler) PullChanges() http.HandlerFunc {
 			return
 		}
 
-		err := h.FS.Pull(ctx.UserID, ctx.Workspace.ID)
+		err := h.S.Pull(ctx.UserID, ctx.Workspace.ID)
 		if err != nil {
 			http.Error(w, "Failed to pull changes: "+err.Error(), http.StatusInternalServerError)
 			return
diff --git a/server/internal/handlers/handlers.go b/server/internal/handlers/handlers.go
index c96ccac..d45f721 100644
--- a/server/internal/handlers/handlers.go
+++ b/server/internal/handlers/handlers.go
@@ -10,14 +10,14 @@ import (
 // Handler provides common functionality for all handlers
 type Handler struct {
 	DB *db.DB
-	FS *filesystem.Storage
+	S  *filesystem.Storage
 }
 
 // NewHandler creates a new handler with the given dependencies
 func NewHandler(db *db.DB, fs *filesystem.Storage) *Handler {
 	return &Handler{
 		DB: db,
-		FS: fs,
+		S:  fs,
 	}
 }
 
diff --git a/server/internal/handlers/user_handlers.go b/server/internal/handlers/user_handlers.go
index 0a3148f..a949f11 100644
--- a/server/internal/handlers/user_handlers.go
+++ b/server/internal/handlers/user_handlers.go
@@ -200,7 +200,7 @@ func (h *Handler) DeleteAccount() http.HandlerFunc {
 
 		// Delete workspace directories
 		for _, workspace := range workspaces {
-			if err := h.FS.DeleteUserWorkspace(ctx.UserID, workspace.ID); err != nil {
+			if err := h.S.DeleteUserWorkspace(ctx.UserID, workspace.ID); err != nil {
 				http.Error(w, "Failed to delete workspace files", http.StatusInternalServerError)
 				return
 			}
diff --git a/server/internal/handlers/workspace_handlers.go b/server/internal/handlers/workspace_handlers.go
index bbb3c59..7c0fea4 100644
--- a/server/internal/handlers/workspace_handlers.go
+++ b/server/internal/handlers/workspace_handlers.go
@@ -45,7 +45,7 @@ func (h *Handler) CreateWorkspace() http.HandlerFunc {
 			return
 		}
 
-		if err := h.FS.InitializeUserWorkspace(workspace.UserID, workspace.ID); err != nil {
+		if err := h.S.InitializeUserWorkspace(workspace.UserID, workspace.ID); err != nil {
 			http.Error(w, "Failed to initialize workspace directory", http.StatusInternalServerError)
 			return
 		}
@@ -107,7 +107,7 @@ func (h *Handler) UpdateWorkspace() http.HandlerFunc {
 		// Handle Git repository setup/teardown if Git settings changed
 		if gitSettingsChanged(&workspace, ctx.Workspace) {
 			if workspace.GitEnabled {
-				if err := h.FS.SetupGitRepo(
+				if err := h.S.SetupGitRepo(
 					ctx.UserID,
 					ctx.Workspace.ID,
 					workspace.GitURL,
@@ -119,7 +119,7 @@ func (h *Handler) UpdateWorkspace() http.HandlerFunc {
 				}
 
 			} else {
-				h.FS.DisableGitRepo(ctx.UserID, ctx.Workspace.ID)
+				h.S.DisableGitRepo(ctx.UserID, ctx.Workspace.ID)
 			}
 		}