diff --git a/backend/.gitignore b/backend/.gitignore
deleted file mode 100644
index 3d6c9d17cc9009e0205dfd95b0f84ff3b0c08c6b..0000000000000000000000000000000000000000
--- a/backend/.gitignore
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maven
-target/
-!.mvn/wrapper/maven-wrapper.jar
-*.original
-
-# STS
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-# IntelliJ IDEA
-.idea
-*.iws
-*.iml
-*.ipr
-
-# NetBeans
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-# VS Code
-.vscode/
-
-# Environment variables
-.env
-.env.local
-.env.*.local
-
-# OS
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Logs
-*.log
-logs/
-
-# Compiled class files
-*.class
-
-# Package Files
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
diff --git a/backend/.mvn/wrapper/maven-wrapper.properties b/backend/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index c0bcafe984fe33005eacbcfabe8b188e0f75afcd..0000000000000000000000000000000000000000
--- a/backend/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-wrapperVersion=3.3.4
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
diff --git a/backend/Dockerfile b/backend/Dockerfile
deleted file mode 100644
index 15626088ac67a0d5db110b336f7dce1329ce293b..0000000000000000000000000000000000000000
--- a/backend/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# ===== STAGE 1: Build the app =====
-FROM maven:3.9.6-eclipse-temurin-17 AS build
-WORKDIR /app
-
-# Copy pom.xml and download dependencies
-COPY pom.xml .
-RUN mvn dependency:go-offline -B
-
-# Copy source and build the JAR
-COPY src ./src
-RUN mvn clean package -DskipTests
-
-# ===== STAGE 2: Run the app =====
-FROM eclipse-temurin:17-jre
-WORKDIR /app
-
-# Copy the JAR from build stage
-COPY --from=build /app/target/*.jar app.jar
-
-# Expose port
-EXPOSE 8080
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-  CMD curl -f http://localhost:8080/actuator/health || exit 1
-
-# Run the application
-ENTRYPOINT ["java", "-jar", "app.jar"]
diff --git a/backend/mvnw b/backend/mvnw
deleted file mode 100644
index bd8896bf2217b46faa0291585e01ac1a3441a958..0000000000000000000000000000000000000000
--- a/backend/mvnw
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.4
-#
-# Optional ENV vars
-# -----------------
-#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
-#   MVNW_REPOURL - repo url base for downloading maven distribution
-#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
-# ----------------------------------------------------------------------------
-
-set -euf
-[ "${MVNW_VERBOSE-}" != debug ] || set -x
-
-# OS specific support.
-native_path() { printf %s\\n "$1"; }
-case "$(uname)" in
-CYGWIN* | MINGW*)
-  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
-  native_path() { cygpath --path --windows "$1"; }
-  ;;
-esac
-
-# set JAVACMD and JAVACCMD
-set_java_home() {
-  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
-  if [ -n "${JAVA_HOME-}" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-      JAVACCMD="$JAVA_HOME/jre/sh/javac"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-      JAVACCMD="$JAVA_HOME/bin/javac"
-
-      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
-        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
-        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
-        return 1
-      fi
-    fi
-  else
-    JAVACMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v java
-    )" || :
-    JAVACCMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v javac
-    )" || :
-
-    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
-      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
-      return 1
-    fi
-  fi
-}
-
-# hash string like Java String::hashCode
-hash_string() {
-  str="${1:-}" h=0
-  while [ -n "$str" ]; do
-    char="${str%"${str#?}"}"
-    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
-    str="${str#?}"
-  done
-  printf %x\\n $h
-}
-
-verbose() { :; }
-[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
-
-die() {
-  printf %s\\n "$1" >&2
-  exit 1
-}
-
-trim() {
-  # MWRAPPER-139:
-  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
-  #   Needed for removing poorly interpreted newline sequences when running in more
-  #   exotic environments such as mingw bash on Windows.
-  printf "%s" "${1}" | tr -d '[:space:]'
-}
-
-scriptDir="$(dirname "$0")"
-scriptName="$(basename "$0")"
-
-# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
-while IFS="=" read -r key value; do
-  case "${key-}" in
-  distributionUrl) distributionUrl=$(trim "${value-}") ;;
-  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
-  esac
-done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-
-case "${distributionUrl##*/}" in
-maven-mvnd-*bin.*)
-  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
-  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
-  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
-  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
-  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
-  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
-  *)
-    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
-    distributionPlatform=linux-amd64
-    ;;
-  esac
-  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
-  ;;
-maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
-*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
-esac
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
-distributionUrlName="${distributionUrl##*/}"
-distributionUrlNameMain="${distributionUrlName%.*}"
-distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
-MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
-
-exec_maven() {
-  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
-  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
-}
-
-if [ -d "$MAVEN_HOME" ]; then
-  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  exec_maven "$@"
-fi
-
-case "${distributionUrl-}" in
-*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
-*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
-esac
-
-# prepare tmp dir
-if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
-  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
-  trap clean HUP INT TERM EXIT
-else
-  die "cannot create temp dir"
-fi
-
-mkdir -p -- "${MAVEN_HOME%/*}"
-
-# Download and Install Apache Maven
-verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-verbose "Downloading from: $distributionUrl"
-verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-# select .zip or .tar.gz
-if ! command -v unzip >/dev/null; then
-  distributionUrl="${distributionUrl%.zip}.tar.gz"
-  distributionUrlName="${distributionUrl##*/}"
-fi
-
-# verbose opt
-__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
-[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-
-# normalize http auth
-case "${MVNW_PASSWORD:+has-password}" in
-'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-esac
-
-if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
-  verbose "Found wget ... using wget"
-  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
-elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
-  verbose "Found curl ... using curl"
-  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
-elif set_java_home; then
-  verbose "Falling back to use Java to download"
-  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
-  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
-  cat >"$javaSource" <<-END
-	public class Downloader extends java.net.Authenticator
-	{
-	  protected java.net.PasswordAuthentication getPasswordAuthentication()
-	  {
-	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
-	  }
-	  public static void main( String[] args ) throws Exception
-	  {
-	    setDefault( new Downloader() );
-	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
-	  }
-	}
-	END
-  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
-  verbose " - Compiling Downloader.java ..."
-  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
-  verbose " - Running Downloader.java ..."
-  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
-fi
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-if [ -n "${distributionSha256Sum-}" ]; then
-  distributionSha256Result=false
-  if [ "$MVN_CMD" = mvnd.sh ]; then
-    echo "Checksum validation is not supported for maven-mvnd." >&2
-    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  elif command -v sha256sum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  elif command -v shasum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
-    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  fi
-  if [ $distributionSha256Result = false ]; then
-    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
-    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-# unzip and move
-if command -v unzip >/dev/null; then
-  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
-else
-  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
-fi
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-actualDistributionDir=""
-
-# First try the expected directory name (for regular distributions)
-if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
-  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
-    actualDistributionDir="$distributionUrlNameMain"
-  fi
-fi
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if [ -z "$actualDistributionDir" ]; then
-  # enable globbing to iterate over items
-  set +f
-  for dir in "$TMP_DOWNLOAD_DIR"/*; do
-    if [ -d "$dir" ]; then
-      if [ -f "$dir/bin/$MVN_CMD" ]; then
-        actualDistributionDir="$(basename "$dir")"
-        break
-      fi
-    fi
-  done
-  set -f
-fi
-
-if [ -z "$actualDistributionDir" ]; then
-  verbose "Contents of $TMP_DOWNLOAD_DIR:"
-  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
-  die "Could not find Maven distribution directory in extracted archive"
-fi
-
-verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
-mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
-
-clean || :
-exec_maven "$@"
diff --git a/backend/mvnw.cmd b/backend/mvnw.cmd
deleted file mode 100644
index 5761d948924c19571d27b465c519b2e2f9e30351..0000000000000000000000000000000000000000
--- a/backend/mvnw.cmd
+++ /dev/null
@@ -1,189 +0,0 @@
-<# : batch portion
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.4
-@REM
-@REM Optional ENV vars
-@REM   MVNW_REPOURL - repo url base for downloading maven distribution
-@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM ----------------------------------------------------------------------------
-
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
-  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
-: end batch / begin powershell #>
-
-$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
-  $VerbosePreference = "Continue"
-}
-
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
-  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
-
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
-  "maven-mvnd-*" {
-    $USE_MVND = $true
-    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
-    $MVN_CMD = "mvnd.cmd"
-    break
-  }
-  default {
-    $USE_MVND = $false
-    $MVN_CMD = $script -replace '^mvnw','mvn'
-    break
-  }
-}
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
-}
-$distributionUrlName = $distributionUrl -replace '^.*/',''
-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-
-$MAVEN_M2_PATH = "$HOME/.m2"
-if ($env:MAVEN_USER_HOME) {
-  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
-}
-
-if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
-    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
-}
-
-$MAVEN_WRAPPER_DISTS = $null
-if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
-  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
-} else {
-  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
-}
-
-$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
-
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
-  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-  exit $?
-}
-
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
-  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
-}
-
-# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
-  if ($TMP_DOWNLOAD_DIR.Exists) {
-    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-  }
-}
-
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
-# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
-  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
-  if ($USE_MVND) {
-    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
-  }
-  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
-  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
-    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
-  }
-}
-
-# unzip and move
-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-$actualDistributionDir = ""
-
-# First try the expected directory name (for regular distributions)
-$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
-$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
-if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
-  $actualDistributionDir = $distributionUrlNameMain
-}
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if (!$actualDistributionDir) {
-  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
-    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
-    if (Test-Path -Path $testPath -PathType Leaf) {
-      $actualDistributionDir = $_.Name
-    }
-  }
-}
-
-if (!$actualDistributionDir) {
-  Write-Error "Could not find Maven distribution directory in extracted archive"
-}
-
-Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
-try {
-  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
-} catch {
-  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
-    Write-Error "fail to move MAVEN_HOME"
-  }
-} finally {
-  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
-
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/backend/pom.xml b/backend/pom.xml
deleted file mode 100644
index 600dcae66075870fa2fa71f8018551540c370085..0000000000000000000000000000000000000000
--- a/backend/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.6</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.locallend</groupId>
-	<artifactId>locallend</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>locallend</name>
-	<description>Demo project for Spring Boot</description>
-	<url/>
-	<licenses>
-		<license/>
-	</licenses>
-	<developers>
-		<developer/>
-	</developers>
-	<scm>
-		<connection/>
-		<developerConnection/>
-		<tag/>
-		<url/>
-	</scm>
-	<properties>
-		<java.version>17</java.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-mongodb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-mail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-web</artifactId>
-	</dependency>
-
-	<!-- JWT for token-based authentication -->
-	<dependency>
-		<groupId>io.jsonwebtoken</groupId>
-		<artifactId>jjwt-api</artifactId>
-		<version>0.11.5</version>
-	</dependency>
-	<dependency>
-		<groupId>io.jsonwebtoken</groupId>
-		<artifactId>jjwt-impl</artifactId>
-		<version>0.11.5</version>
-		<scope>runtime</scope>
-	</dependency>
-	<dependency>
-		<groupId>io.jsonwebtoken</groupId>
-		<artifactId>jjwt-jackson</artifactId>
-		<version>0.11.5</version>
-		<scope>runtime</scope>
-	</dependency>
-
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-test</artifactId>
-		<scope>test</scope>
-	</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Cloudinary for image upload and management -->
-		<dependency>
-			<groupId>com.cloudinary</groupId>
-			<artifactId>cloudinary-http44</artifactId>
-			<version>1.38.0</version>
-		</dependency>
-
-		<!-- dotenv for loading .env files -->
-		<dependency>
-			<groupId>me.paulschwarz</groupId>
-			<artifactId>spring-dotenv</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/backend/src/main/java/com/locallend/locallend/LocallendApplication.java b/backend/src/main/java/com/locallend/locallend/LocallendApplication.java
deleted file mode 100644
index e9018f392e5f56d92f16faf687032d36bb924afc..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/LocallendApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.locallend.locallend;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class LocallendApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(LocallendApplication.class, args);
-	}
-
-}
diff --git a/backend/src/main/java/com/locallend/locallend/config/CategoryDataInitializer.java b/backend/src/main/java/com/locallend/locallend/config/CategoryDataInitializer.java
deleted file mode 100644
index e2cbc2e4ab0eff2e02e46f243b703684cc420a06..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/CategoryDataInitializer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.locallend.locallend.config;
-
-import com.locallend.locallend.model.Category;
-import com.locallend.locallend.repository.CategoryRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Initializes default categories in the database at startup.
- * This ensures that the application has basic categories available
- * immediately after deployment without manual intervention.
- */
-@Component
-@Profile("prod") // Only run in production profile used in docker-compose
-public class CategoryDataInitializer implements ApplicationRunner {
-    
-    private static final Logger log = LoggerFactory.getLogger(CategoryDataInitializer.class);
-    private final CategoryRepository categoryRepository;
-
-    public CategoryDataInitializer(CategoryRepository categoryRepository) {
-        this.categoryRepository = categoryRepository;
-    }
-
-    @Override
-    public void run(ApplicationArguments args) {
-        initializeDefaultCategories();
-    }
-
-    private void initializeDefaultCategories() {
-        // Check if categories already exist to avoid duplicates
-        long existingCategoryCount = categoryRepository.count();
-        if (existingCategoryCount > 0) {
-            log.info("[CategoryInit] Categories already exist ({}), skipping initialization", existingCategoryCount);
-            return;
-        }
-
-        log.info("[CategoryInit] Initializing default categories...");
-
-        List<Category> defaultCategories = Arrays.asList(
-            createCategory("Electronics", "Electronic devices, gadgets, and technology items including phones, laptops, cameras, and accessories"),
-            createCategory("Tools", "Hand tools, power tools, and equipment for construction, repair, and maintenance work"),
-            createCategory("Sports", "Sports equipment, gear, and accessories for various athletic activities and outdoor recreation"),
-            createCategory("Books", "Books, magazines, educational materials, and reading resources across all genres and topics"),
-            createCategory("Furniture", "Home and office furniture including chairs, tables, storage solutions, and decorative pieces"),
-            createCategory("Vehicles", "Cars, motorcycles, bicycles, and other transportation vehicles and related accessories"),
-            createCategory("Appliances", "Home appliances, kitchen equipment, and household electrical devices"),
-            createCategory("Others", "Miscellaneous items that don't fit into other specific categories")
-        );
-
-        try {
-            List<Category> savedCategories = categoryRepository.saveAll(defaultCategories);
-            log.info("[CategoryInit] Successfully initialized {} categories", savedCategories.size());
-            
-            // Log each category for verification
-            savedCategories.forEach(category -> 
-                log.info("[CategoryInit] Created category: {} (ID: {})", category.getName(), category.getId())
-            );
-            
-        } catch (Exception e) {
-            log.error("[CategoryInit] Failed to initialize categories", e);
-            throw new RuntimeException("Failed to initialize default categories", e);
-        }
-    }
-
-    private Category createCategory(String name, String description) {
-        Category category = new Category();
-        category.setName(name);
-        category.setDescription(description);
-        category.setCreatedAt(LocalDateTime.now());
-        category.setUpdatedAt(LocalDateTime.now());
-        return category;
-    }
-}
\ No newline at end of file
diff --git a/backend/src/main/java/com/locallend/locallend/config/CloudinaryConfig.java b/backend/src/main/java/com/locallend/locallend/config/CloudinaryConfig.java
deleted file mode 100644
index 999b8d6e56f817ff757c7243235d4f76c0291636..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/CloudinaryConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.locallend.locallend.config;
-
-import com.cloudinary.Cloudinary;
-import com.cloudinary.utils.ObjectUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration class for Cloudinary integration.
- * Initializes Cloudinary instance with credentials from application.properties.
- */
-@Configuration
-public class CloudinaryConfig {
-
-    @Value("${cloudinary.cloud-name}")
-    private String cloudName;
-
-    @Value("${cloudinary.api-key}")
-    private String apiKey;
-
-    @Value("${cloudinary.api-secret}")
-    private String apiSecret;
-
-    /**
-     * Creates and configures a Cloudinary bean.
-     * @return Configured Cloudinary instance
-     */
-    @Bean
-    public Cloudinary cloudinary() {
-        return new Cloudinary(ObjectUtils.asMap(
-                "cloud_name", cloudName,
-                "api_key", apiKey,
-                "api_secret", apiSecret,
-                "secure", true
-        ));
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/config/CorsConfig.java b/backend/src/main/java/com/locallend/locallend/config/CorsConfig.java
deleted file mode 100644
index f6dd9279dc685cccb7e0e4de3dc8f1b360dedd13..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/CorsConfig.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.locallend.locallend.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * CORS (Cross-Origin Resource Sharing) configuration for the LocalLend application.
- * Enables the frontend to communicate with the backend from different origins.
- */
-@Configuration
-public class CorsConfig {
-
-    /**
-     * CORS configuration source that defines allowed origins, methods, and headers.
-     * This enables the React frontend (localhost:5173) to communicate with the backend (localhost:8080).
-     * 
-     * @return CorsConfigurationSource with appropriate CORS settings
-     */
-    @Bean
-    public CorsConfigurationSource corsConfigurationSource() {
-        CorsConfiguration configuration = new CorsConfiguration();
-        
-        // Allow requests from frontend origins
-        configuration.setAllowedOriginPatterns(Arrays.asList(
-            "http://localhost",          // Production (Nginx on port 80)
-            "http://localhost:80",       // Production (explicit port 80)
-            "http://localhost:3000",     // Create React App default
-            "http://localhost:5173",     // Vite default port
-            "http://127.0.0.1",          // Production (alternative localhost)
-            "http://127.0.0.1:80",       // Production (alternative localhost port 80)
-            "http://127.0.0.1:3000",     // Alternative localhost
-            "http://127.0.0.1:5173",     // Alternative localhost
-            "https://*.hf.space",        // Hugging Face Spaces
-            "https://*.huggingface.co"   // Hugging Face domain
-        ));
-        
-        // Allow specific HTTP methods
-        configuration.setAllowedMethods(Arrays.asList(
-            "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"
-        ));
-        
-        // Allow all headers (including custom headers like Authorization)
-        configuration.setAllowedHeaders(List.of("*"));
-        
-        // Allow credentials (cookies, authorization headers, etc.)
-        configuration.setAllowCredentials(true);
-        
-        // Cache preflight requests for 1 hour
-        configuration.setMaxAge(3600L);
-        
-        // Apply this configuration to all endpoints
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", configuration);
-        
-        return source;
-    }
-}
\ No newline at end of file
diff --git a/backend/src/main/java/com/locallend/locallend/config/MongoTextIndexInitializer.java b/backend/src/main/java/com/locallend/locallend/config/MongoTextIndexInitializer.java
deleted file mode 100644
index 596044063a4b339044a17e2fa8786b376951ff35..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/MongoTextIndexInitializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.locallend.locallend.config;
-
-import com.locallend.locallend.model.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.index.TextIndexDefinition;
-import org.springframework.stereotype.Component;
-
-
-/**
- * Ensures required MongoDB text indexes exist at startup so that search endpoints work
- * on a freshly created database without manual intervention.
- */
-@Component
-@Profile("prod") // limit to prod profile used in docker-compose
-public class MongoTextIndexInitializer implements ApplicationRunner {
-    private static final Logger log = LoggerFactory.getLogger(MongoTextIndexInitializer.class);
-    private final MongoTemplate mongoTemplate;
-
-    public MongoTextIndexInitializer(MongoTemplate mongoTemplate) {
-        this.mongoTemplate = mongoTemplate;
-    }
-
-    @Override
-    public void run(ApplicationArguments args) {
-        ensureCategoryTextIndex();
-    }
-
-    private void ensureCategoryTextIndex() {
-    TextIndexDefinition def = new TextIndexDefinition.TextIndexDefinitionBuilder()
-        .onField("name")
-        .onField("description")
-        .build();
-    String indexName = mongoTemplate.indexOps(Category.class).createIndex(def);
-    log.info("[MongoIndex] Ensured Category text index (name='{}') on fields: name, description", indexName);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/config/SecurityConfig.java b/backend/src/main/java/com/locallend/locallend/config/SecurityConfig.java
deleted file mode 100644
index b46ff4ac1889554f000de174c52274b8c89d3384..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/SecurityConfig.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.locallend.locallend.config;
-
-import com.locallend.locallend.security.JwtAuthenticationFilter;
-import com.locallend.locallend.security.JwtTokenProvider;
-import com.locallend.locallend.security.MongoUserDetailsService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-/**
- * Spring Security configuration with JWT authentication.
- * Protects endpoints while allowing public access to auth endpoints.
- */
-@Configuration
-public class SecurityConfig {
-
-    private final MongoUserDetailsService userDetailsService;
-    private final JwtTokenProvider jwtTokenProvider;
-
-    public SecurityConfig(MongoUserDetailsService userDetailsService, 
-                          JwtTokenProvider jwtTokenProvider) {
-        this.userDetailsService = userDetailsService;
-        this.jwtTokenProvider = jwtTokenProvider;
-    }
-
-    /**
-     * Password encoder bean using BCrypt.
-     * @return BCryptPasswordEncoder instance
-     */
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-    /**
-     * Authentication manager bean for manual authentication.
-     * @param config Authentication configuration
-     * @return AuthenticationManager
-     * @throws Exception if configuration fails
-     */
-    @Bean
-    public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
-        return config.getAuthenticationManager();
-    }
-
-    /**
-     * JWT authentication filter bean.
-     * @return JwtAuthenticationFilter instance
-     */
-    @Bean
-    public JwtAuthenticationFilter jwtAuthenticationFilter() {
-        return new JwtAuthenticationFilter(jwtTokenProvider, userDetailsService);
-    }
-
-    /**
-     * Security filter chain configuration.
-     * Defines endpoint protection rules and integrates JWT filter.
-     * @param http HttpSecurity
-     * @return SecurityFilterChain
-     * @throws Exception if configuration fails
-     */
-    @Bean
-    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http
-            .csrf(AbstractHttpConfigurer::disable)
-            .cors(Customizer.withDefaults())
-            .sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-            .authorizeHttpRequests(auth -> auth
-                // Public endpoints - no authentication required
-                .requestMatchers(HttpMethod.POST, "/api/auth/register").permitAll()
-                .requestMatchers(HttpMethod.POST, "/api/auth/login").permitAll()
-                
-                // Public category and item browsing
-                .requestMatchers(HttpMethod.GET, "/api/categories/**").permitAll()
-                .requestMatchers(HttpMethod.GET, "/api/items/**").permitAll()
-                .requestMatchers(HttpMethod.GET, "/api/users/*/public").permitAll()
-                .requestMatchers(HttpMethod.GET, "/api/users/search").permitAll()
-                
-                // All other endpoints require authentication
-                .anyRequest().authenticated()
-            )
-            // Add JWT filter before Spring Security's authentication filter
-            .addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
-        
-        return http.build();
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/config/ValidationConfig.java b/backend/src/main/java/com/locallend/locallend/config/ValidationConfig.java
deleted file mode 100644
index e98a608a52c712faeb36f2f6c362a0c4d8880f7e..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/config/ValidationConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.locallend.locallend.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
-
-import jakarta.validation.Validator;
-
-/**
- * Configuration for Jakarta Bean Validation (JSR-380).
- * Ensures validation annotations on entities and DTOs are processed.
- * Issue #29: Production-ready validation support
- */
-@Configuration
-public class ValidationConfig {
-
-    /**
-     * Configure validator factory bean.
-     * Enables @Valid, @NotBlank, @Size, @Email, @Pattern, etc. annotations
-     * @return LocalValidatorFactoryBean instance
-     */
-    @Bean
-    public LocalValidatorFactoryBean validator() {
-        return new LocalValidatorFactoryBean();
-    }
-    
-    /**
-     * Provide Validator bean for programmatic validation.
-     * Can be injected into services for manual validation if needed.
-     * @return Validator instance
-     */
-    @Bean
-    public Validator validatorBean() {
-        return validator();
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/AuthController.java b/backend/src/main/java/com/locallend/locallend/controller/AuthController.java
deleted file mode 100644
index 9df58e9ba6ac50c7823a6ab3506211f763f50423..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/AuthController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.request.UserLoginDto;
-import com.locallend.locallend.dto.request.UserRegistrationDto;
-import com.locallend.locallend.dto.response.JwtAuthResponseDto;
-import com.locallend.locallend.dto.response.UserResponseDto;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.security.JwtTokenProvider;
-import com.locallend.locallend.service.UserService;
-import com.locallend.locallend.util.UserMapper;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * REST controller for authentication operations.
- * Handles user registration and login with JWT token generation.
- */
-@RestController
-@RequestMapping("/api/auth")
-public class AuthController {
-
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private UserMapper userMapper;
-
-    @Autowired
-    private JwtTokenProvider jwtTokenProvider;
-
-    /**
-     * Register a new user.
-     * @param dto User registration data
-     * @return Created user response DTO
-     */
-    @PostMapping("/register")
-    public ResponseEntity<UserResponseDto> register(@Valid @RequestBody UserRegistrationDto dto) {
-        User user = userService.registerUser(dto);
-        UserResponseDto response = userMapper.toUserResponseDto(user);
-        return ResponseEntity.status(HttpStatus.CREATED).body(response);
-    }
-
-    /**
-     * Authenticate user and login with JWT token.
-     * @param dto Login credentials (username/email and password)
-     * @return JWT token and user information
-     */
-    @PostMapping("/login")
-    public ResponseEntity<JwtAuthResponseDto> login(@Valid @RequestBody UserLoginDto dto) {
-        User user = userService.verifyCredentials(dto.getUsernameOrEmail(), dto.getPassword());
-        
-        // Generate JWT token
-        String token = jwtTokenProvider.generateToken(user.getUsername());
-        
-        // Prepare response with token and user data
-        UserResponseDto userResponse = userMapper.toUserResponseDto(user);
-        JwtAuthResponseDto response = new JwtAuthResponseDto(token, userResponse);
-        
-        return ResponseEntity.ok(response);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/BookingController.java b/backend/src/main/java/com/locallend/locallend/controller/BookingController.java
deleted file mode 100644
index 41abd8b9a29d86a54940ca18275ca98c0aeb16c6..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/BookingController.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.request.BookingRequestDto;
-import com.locallend.locallend.dto.response.BookingResponseDto;
-import com.locallend.locallend.exception.BookingConflictException;
-import com.locallend.locallend.exception.BookingNotFoundException;
-import com.locallend.locallend.exception.InvalidBookingPeriodException;
-import com.locallend.locallend.service.BookingService;
-import jakarta.validation.Valid;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api/bookings")
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class BookingController {
-
-    private final BookingService bookingService;
-
-    public BookingController(BookingService bookingService) {
-        this.bookingService = bookingService;
-    }
-
-    @PostMapping
-    public ResponseEntity<?> createBooking(@Valid @RequestBody BookingRequestDto request,
-                                           @RequestHeader("X-User-Id") String borrowerId) {
-        try {
-            BookingResponseDto dto = bookingService.createBooking(request, borrowerId);
-            return ResponseEntity.status(HttpStatus.CREATED).body(dto);
-        } catch (BookingConflictException e) {
-            return error(HttpStatus.CONFLICT, "Booking conflict", e.getMessage(), "BOOKING_CONFLICT");
-        } catch (InvalidBookingPeriodException e) {
-            return error(HttpStatus.BAD_REQUEST, "Invalid booking period", e.getMessage(), "INVALID_PERIOD");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Booking creation failed", e.getMessage(), "BOOKING_CREATE_ERROR");
-        } catch (Exception e) {
-            return error(HttpStatus.INTERNAL_SERVER_ERROR, "Unexpected error", e.getMessage(), "INTERNAL_ERROR");
-        }
-    }
-
-    @GetMapping("/{id}")
-    public ResponseEntity<?> getBooking(@PathVariable String id) {
-        try {
-            BookingResponseDto dto = bookingService.getBookingById(id);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        }
-    }
-
-    /**
-     * Get borrower's bookings (Issue #15 naming)
-     */
-    @GetMapping("/my-bookings")
-    public ResponseEntity<?> myBookings(@RequestHeader("X-User-Id") String userId) {
-        List<BookingResponseDto> list = bookingService.getBookingsForBorrower(userId);
-        return ResponseEntity.ok(list);
-    }
-
-    /**
-     * Get borrower's bookings (original endpoint)
-     */
-    @GetMapping("/my")
-    public ResponseEntity<?> myBookingsOriginal(@RequestHeader("X-User-Id") String userId) {
-        List<BookingResponseDto> list = bookingService.getBookingsForBorrower(userId);
-        return ResponseEntity.ok(list);
-    }
-
-    /**
-     * Get pending approvals for owner (Issue #15 naming)
-     */
-    @GetMapping("/pending-approvals")
-    public ResponseEntity<?> pendingApprovals(@RequestHeader("X-User-Id") String ownerId) {
-        try {
-            com.locallend.locallend.model.enums.BookingStatus pendingStatus = 
-                com.locallend.locallend.model.enums.BookingStatus.PENDING;
-            List<BookingResponseDto> bookings = bookingService.getBookingsForOwner(ownerId);
-            // Filter for PENDING status
-            List<BookingResponseDto> pending = bookings.stream()
-                .filter(b -> b.getStatus() == pendingStatus)
-                .toList();
-            return ResponseEntity.ok(pending);
-        } catch (Exception e) {
-            return error(HttpStatus.INTERNAL_SERVER_ERROR, "Error fetching pending approvals", e.getMessage(), "FETCH_ERROR");
-        }
-    }
-
-    /**
-     * Get owner's bookings (original endpoint)
-     */
-    @GetMapping("/my-owned")
-    public ResponseEntity<?> myOwnedBookings(@RequestHeader("X-User-Id") String ownerId) {
-        List<BookingResponseDto> list = bookingService.getBookingsForOwner(ownerId);
-        return ResponseEntity.ok(list);
-    }
-
-    /**
-     * Approve booking - Issue #15 naming (alias for confirm)
-     */
-    @PatchMapping("/{id}/approve")
-    public ResponseEntity<?> approve(@PathVariable String id,
-                                     @RequestHeader("X-User-Id") String ownerId,
-                                     @RequestBody(required = false) Map<String, String> body) {
-        String notes = body != null ? body.get("ownerNotes") : null;
-        try {
-            BookingResponseDto dto = bookingService.confirm(id, ownerId, notes);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot approve booking", e.getMessage(), "BOOKING_APPROVE_ERROR");
-        }
-    }
-
-    /**
-     * Confirm booking - original endpoint
-     */
-    @PatchMapping("/{id}/confirm")
-    public ResponseEntity<?> confirm(@PathVariable String id,
-                                      @RequestHeader("X-User-Id") String ownerId,
-                                      @RequestBody(required = false) Map<String, String> body) {
-        String notes = body != null ? body.get("ownerNotes") : null;
-        try {
-            BookingResponseDto dto = bookingService.confirm(id, ownerId, notes);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot confirm booking", e.getMessage(), "BOOKING_CONFIRM_ERROR");
-        }
-    }
-
-    /**
-     * Start booking - Issue #15 naming (alias for activate)
-     */
-    @PatchMapping("/{id}/start")
-    public ResponseEntity<?> start(@PathVariable String id,
-                                    @RequestHeader("X-User-Id") String borrowerId) {
-        try {
-            BookingResponseDto dto = bookingService.activate(id, borrowerId);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot start booking", e.getMessage(), "BOOKING_START_ERROR");
-        }
-    }
-
-    /**
-     * Activate booking - original endpoint
-     */
-    @PatchMapping("/{id}/activate")
-    public ResponseEntity<?> activate(@PathVariable String id,
-                                       @RequestHeader("X-User-Id") String borrowerId) {
-        try {
-            BookingResponseDto dto = bookingService.activate(id, borrowerId);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot activate booking", e.getMessage(), "BOOKING_ACTIVATE_ERROR");
-        }
-    }
-
-    @PatchMapping("/{id}/complete")
-    public ResponseEntity<?> complete(@PathVariable String id,
-                                       @RequestHeader("X-User-Id") String borrowerId) {
-        try {
-            BookingResponseDto dto = bookingService.complete(id, borrowerId);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot complete booking", e.getMessage(), "BOOKING_COMPLETE_ERROR");
-        }
-    }
-
-    @PatchMapping("/{id}/cancel")
-    public ResponseEntity<?> cancel(@PathVariable String id,
-                                     @RequestHeader("X-User-Id") String borrowerId,
-                                     @RequestBody(required = false) Map<String, String> body) {
-        String reason = body != null ? body.get("reason") : null;
-        try {
-            BookingResponseDto dto = bookingService.cancel(id, borrowerId, reason);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot cancel booking", e.getMessage(), "BOOKING_CANCEL_ERROR");
-        }
-    }
-
-    @PatchMapping("/{id}/reject")
-    public ResponseEntity<?> reject(@PathVariable String id,
-                                     @RequestHeader("X-User-Id") String ownerId,
-                                     @RequestBody(required = false) Map<String, String> body) {
-        String reason = body != null ? body.get("reason") : null;
-        try {
-            BookingResponseDto dto = bookingService.reject(id, ownerId, reason);
-            return ResponseEntity.ok(dto);
-        } catch (BookingNotFoundException e) {
-            return error(HttpStatus.NOT_FOUND, "Booking not found", e.getMessage(), "BOOKING_NOT_FOUND");
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return error(HttpStatus.BAD_REQUEST, "Cannot reject booking", e.getMessage(), "BOOKING_REJECT_ERROR");
-        }
-    }
-
-    @GetMapping("/active")
-    public ResponseEntity<?> activeBookings() {
-        return ResponseEntity.ok(bookingService.getActiveBookings());
-    }
-
-    @GetMapping("/overdue")
-    public ResponseEntity<?> overdueBookings() {
-        return ResponseEntity.ok(bookingService.getOverdueBookings());
-    }
-
-    
-
-    @GetMapping("/by-status")
-    public ResponseEntity<?> bookingsByStatus(@RequestParam String status,
-                                              @RequestHeader("X-User-Id") String userId) {
-        try {
-            com.locallend.locallend.model.enums.BookingStatus bookingStatus = 
-                com.locallend.locallend.model.enums.BookingStatus.fromString(status);
-            List<BookingResponseDto> bookings = bookingService.getBookingsByStatus(bookingStatus, userId);
-            return ResponseEntity.ok(bookings);
-        } catch (IllegalArgumentException e) {
-            return error(HttpStatus.BAD_REQUEST, "Invalid status", e.getMessage(), "INVALID_STATUS");
-        }
-    }
-
-    @GetMapping("/item/{itemId}/active")
-    public ResponseEntity<?> activeBookingsForItem(@PathVariable String itemId) {
-        return ResponseEntity.ok(bookingService.getActiveBookingsForItem(itemId));
-    }
-
-    @PostMapping("/process-overdue")
-    public ResponseEntity<?> processOverdue() {
-        int count = bookingService.processOverdueBookings();
-        Map<String, Object> resp = new HashMap<>();
-        resp.put("success", true);
-        resp.put("message", "Processed overdue bookings");
-        resp.put("count", count);
-        return ResponseEntity.ok(resp);
-    }
-
-    private ResponseEntity<Map<String, Object>> error(HttpStatus status, String message, String details, String code) {
-        Map<String, Object> resp = new HashMap<>();
-        resp.put("success", false);
-        resp.put("message", message);
-        resp.put("details", details);
-        resp.put("error_code", code);
-        return ResponseEntity.status(status).body(resp);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/CategoryController.java b/backend/src/main/java/com/locallend/locallend/controller/CategoryController.java
deleted file mode 100644
index efa1b292e0c364f4c779f729b82b90170c322415..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/CategoryController.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.CategoryDto;
-import com.locallend.locallend.dto.CreateCategoryRequest;
-import com.locallend.locallend.exception.CategoryNotFoundException;
-import com.locallend.locallend.service.CategoryService;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api/categories")
-@Validated
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class CategoryController {
-
-    private static final Logger logger = LoggerFactory.getLogger(CategoryController.class);
-
-    private final CategoryService categoryService;
-
-    public CategoryController(CategoryService categoryService) {
-        this.categoryService = categoryService;
-    }
-
-    @PostMapping
-    public ResponseEntity<?> createCategory(@Valid @RequestBody CreateCategoryRequest request) {
-        logger.info("Request to create category: {}", request.getName());
-
-        try {
-            CategoryDto createdCategory = categoryService.createCategory(request);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Category created successfully");
-            response.put("data", createdCategory);
-
-            return ResponseEntity.status(HttpStatus.CREATED).body(response);
-
-        } catch (IllegalArgumentException e) {
-            logger.error("Invalid category creation request: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "CATEGORY_ALREADY_EXISTS");
-
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-
-        } catch (CategoryNotFoundException e) {
-            logger.error("Parent category not found: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Parent category not found");
-            errorResponse.put("error_code", "PARENT_CATEGORY_NOT_FOUND");
-
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-        }
-    }
-
-    @GetMapping
-    public ResponseEntity<?> getAllCategories(
-            @RequestParam(value = "sort", defaultValue = "name") String sortBy) {
-        logger.info("Request to get all categories with sort: {}", sortBy);
-
-        try {
-            List<CategoryDto> categories = categoryService.getAllCategories(sortBy);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Categories retrieved successfully");
-            response.put("data", categories);
-            response.put("count", categories.size());
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving categories: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving categories");
-            errorResponse.put("error_code", "INTERNAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    @GetMapping("/{categoryId}")
-    public ResponseEntity<?> getCategoryById(
-            @PathVariable @NotBlank(message = "Category ID is required") String categoryId) {
-        logger.info("Request to get category by ID: {}", categoryId);
-
-        try {
-            CategoryDto category = categoryService.getCategoryById(categoryId);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Category retrieved successfully");
-            response.put("data", category);
-
-            return ResponseEntity.ok(response);
-
-        } catch (CategoryNotFoundException e) {
-            logger.error("Category not found: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "CATEGORY_NOT_FOUND");
-
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
-        }
-    }
-
-    @GetMapping("/root")
-    public ResponseEntity<?> getRootCategories(
-            @RequestParam(value = "sort", defaultValue = "name") String sortBy) {
-        logger.info("Request to get root categories with sort: {}", sortBy);
-
-        try {
-            List<CategoryDto> rootCategories = categoryService.getRootCategories(sortBy);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Root categories retrieved successfully");
-            response.put("data", rootCategories);
-            response.put("count", rootCategories.size());
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving root categories: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving root categories");
-            errorResponse.put("error_code", "INTERNAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    @GetMapping("/{parentId}/subcategories")
-    public ResponseEntity<?> getSubcategories(
-            @PathVariable @NotBlank(message = "Parent category ID is required") String parentId,
-            @RequestParam(value = "sort", defaultValue = "name") String sortBy) {
-        logger.info("Request to get subcategories for parent: {}", parentId);
-
-        try {
-            List<CategoryDto> subcategories = categoryService.getSubcategories(parentId, sortBy);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Subcategories retrieved successfully");
-            response.put("data", subcategories);
-            response.put("count", subcategories.size());
-            response.put("parent_id", parentId);
-
-            return ResponseEntity.ok(response);
-
-        } catch (CategoryNotFoundException e) {
-            logger.error("Parent category not found: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "PARENT_CATEGORY_NOT_FOUND");
-
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
-        }
-    }
-
-    @GetMapping("/search")
-    public ResponseEntity<?> searchCategories(
-            @RequestParam @NotBlank(message = "Search term is required") String q,
-            @RequestParam(value = "sort", defaultValue = "name") String sortBy) {
-        logger.info("Request to search categories with term: {}", q);
-
-        try {
-            List<CategoryDto> categories = categoryService.searchCategories(q, sortBy);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Categories search completed successfully");
-            response.put("data", categories);
-            response.put("count", categories.size());
-            response.put("search_term", q);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error searching categories: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error searching categories");
-            errorResponse.put("error_code", "SEARCH_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    @GetMapping("/popular")
-    public ResponseEntity<?> getPopularCategories(
-            @RequestParam(value = "min_items", defaultValue = "1") long minItems) {
-        logger.info("Request to get popular categories with minimum {} items", minItems);
-
-        try {
-            List<CategoryDto> popularCategories = categoryService.getPopularCategories(minItems);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Popular categories retrieved successfully");
-            response.put("data", popularCategories);
-            response.put("count", popularCategories.size());
-            response.put("min_items", minItems);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving popular categories: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving popular categories");
-            errorResponse.put("error_code", "INTERNAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    @PatchMapping("/{categoryId}/status")
-    public ResponseEntity<?> updateCategoryStatus(
-            @PathVariable @NotBlank(message = "Category ID is required") String categoryId,
-            @RequestParam boolean is_active) {
-        logger.info("Request to update category {} status to: {}", categoryId, is_active);
-
-        try {
-            CategoryDto updatedCategory = categoryService.updateCategoryStatus(categoryId, is_active);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Category status updated successfully");
-            response.put("data", updatedCategory);
-
-            return ResponseEntity.ok(response);
-
-        } catch (CategoryNotFoundException e) {
-            logger.error("Category not found: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "CATEGORY_NOT_FOUND");
-
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
-        }
-    }
-
-    @ExceptionHandler(org.springframework.web.bind.MethodArgumentNotValidException.class)
-    public ResponseEntity<?> handleValidationExceptions(
-            org.springframework.web.bind.MethodArgumentNotValidException ex) {
-
-        Map<String, String> errors = new HashMap<>();
-        ex.getBindingResult().getFieldErrors().forEach(error ->
-                errors.put(error.getField(), error.getDefaultMessage()));
-
-        Map<String, Object> errorResponse = new HashMap<>();
-        errorResponse.put("success", false);
-        errorResponse.put("message", "Validation failed");
-        errorResponse.put("error_code", "VALIDATION_ERROR");
-        errorResponse.put("errors", errors);
-
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/ImageController.java b/backend/src/main/java/com/locallend/locallend/controller/ImageController.java
deleted file mode 100644
index cc7550af0309214a58190428dd53655e2c93afc9..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/ImageController.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.service.ImageService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * REST Controller for image upload operations.
- * Handles file uploads to Cloudinary and image deletion.
- */
-@RestController
-@RequestMapping("/api/images")
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class ImageController {
-
-    private static final Logger logger = LoggerFactory.getLogger(ImageController.class);
-    
-    private final ImageService imageService;
-
-    public ImageController(ImageService imageService) {
-        this.imageService = imageService;
-    }
-
-    /**
-     * Upload a single image
-     * POST /api/images/upload
-     * @param file The image file to upload
-     * @param folder Optional folder name (defaults to "locallend/items")
-     * @return JSON response with image URL
-     */
-    @PostMapping("/upload")
-    public ResponseEntity<?> uploadImage(
-            @RequestParam("file") MultipartFile file,
-            @RequestParam(value = "folder", defaultValue = "locallend/items") String folder) {
-        
-        try {
-            logger.info("Received image upload request: {}", file.getOriginalFilename());
-            
-            if (!imageService.isConfigured()) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Cloudinary not configured");
-                error.put("message", "Please configure Cloudinary credentials in application.properties");
-                return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(error);
-            }
-            
-            String imageUrl = imageService.uploadImage(file, folder);
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Image uploaded successfully");
-            response.put("url", imageUrl);
-            response.put("filename", file.getOriginalFilename());
-            
-            return ResponseEntity.ok(response);
-            
-        } catch (IllegalArgumentException e) {
-            logger.warn("Image validation failed: {}", e.getMessage());
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Validation failed");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-            
-        } catch (Exception e) {
-            logger.error("Image upload failed", e);
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Upload failed");
-            error.put("message", "Failed to upload image: " + e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    /**
-     * Upload multiple images
-     * POST /api/images/upload-multiple
-     * @param files Array of image files to upload
-     * @param folder Optional folder name (defaults to "locallend/items")
-     * @return JSON response with array of image URLs
-     */
-    @PostMapping("/upload-multiple")
-    public ResponseEntity<?> uploadMultipleImages(
-            @RequestParam("files") MultipartFile[] files,
-            @RequestParam(value = "folder", defaultValue = "locallend/items") String folder) {
-        
-        try {
-            logger.info("Received multiple image upload request: {} files", files.length);
-            
-            if (!imageService.isConfigured()) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Cloudinary not configured");
-                error.put("message", "Please configure Cloudinary credentials in application.properties");
-                return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(error);
-            }
-            
-            if (files.length == 0) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "No files provided");
-                error.put("message", "Please select at least one image to upload");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-            }
-            
-            if (files.length > 10) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Too many files");
-                error.put("message", "Maximum 10 images can be uploaded at once");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-            }
-            
-            List<String> imageUrls = imageService.uploadMultipleImages(files, folder);
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Images uploaded successfully");
-            response.put("urls", imageUrls);
-            response.put("count", imageUrls.size());
-            
-            return ResponseEntity.ok(response);
-            
-        } catch (IllegalArgumentException e) {
-            logger.warn("Image validation failed: {}", e.getMessage());
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Validation failed");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-            
-        } catch (Exception e) {
-            logger.error("Multiple image upload failed", e);
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Upload failed");
-            error.put("message", "Failed to upload images: " + e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    /**
-     * Delete an image from Cloudinary
-     * DELETE /api/images
-     * @param imageUrl The full Cloudinary URL of the image to delete
-     * @return Success or error response
-     */
-    @DeleteMapping
-    public ResponseEntity<?> deleteImage(@RequestParam("url") String imageUrl) {
-        try {
-            logger.info("Received image deletion request: {}", imageUrl);
-            
-            if (!imageService.isConfigured()) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Cloudinary not configured");
-                error.put("message", "Please configure Cloudinary credentials in application.properties");
-                return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(error);
-            }
-            
-            boolean deleted = imageService.deleteImage(imageUrl);
-            
-            if (deleted) {
-                Map<String, Object> response = new HashMap<>();
-                response.put("success", true);
-                response.put("message", "Image deleted successfully");
-                return ResponseEntity.ok(response);
-            } else {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Deletion failed");
-                error.put("message", "Could not delete image. It may not exist or URL is invalid.");
-                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-            }
-            
-        } catch (Exception e) {
-            logger.error("Image deletion failed", e);
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Deletion failed");
-            error.put("message", "Failed to delete image: " + e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    /**
-     * Health check endpoint to verify Cloudinary configuration
-     * GET /api/images/health
-     * @return Configuration status
-     */
-    @GetMapping("/health")
-    public ResponseEntity<?> healthCheck() {
-        Map<String, Object> response = new HashMap<>();
-        boolean configured = imageService.isConfigured();
-        
-        response.put("configured", configured);
-        response.put("message", configured 
-                ? "Cloudinary is properly configured" 
-                : "Cloudinary credentials not configured");
-        
-        return ResponseEntity.ok(response);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/ItemController.java b/backend/src/main/java/com/locallend/locallend/controller/ItemController.java
deleted file mode 100644
index df04e142c8872928b95cf183440bb779c5dc4769..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/ItemController.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.CreateItemRequest;
-import com.locallend.locallend.dto.ItemDTO;
-import com.locallend.locallend.dto.UpdateItemRequest;
-import com.locallend.locallend.service.ItemService;
-import jakarta.validation.Valid;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * REST Controller for Item management in the LocalLend platform.
- * Provides endpoints for CRUD operations, search, filtering, and availability management.
- */
-@RestController
-@RequestMapping("/api/items")
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class ItemController {
-
-    private final ItemService itemService;
-
-    public ItemController(ItemService itemService) {
-        this.itemService = itemService;
-    }
-
-    /**
-     * Create a new item
-     * POST /api/items
-     * Request body: CreateItemRequest (name, description, categoryId, deposit, images, condition)
-     * Request header: X-User-Id (required for owner identification)
-     */
-    @PostMapping
-    public ResponseEntity<?> createItem(
-            @Valid @RequestBody CreateItemRequest request,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            ItemDTO item = itemService.createItem(request, userId);
-            return ResponseEntity.status(HttpStatus.CREATED).body(item);
-        } catch (IllegalArgumentException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Invalid request");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to create item");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    /**
-     * Get all available items with pagination and sorting
-     * GET /api/items
-     * Query params: page (default: 0), size (default: 10), sortBy (default: name), sortDir (default: asc)
-     */
-    @GetMapping
-    public ResponseEntity<Page<ItemDTO>> getAllAvailableItems(
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size,
-            @RequestParam(defaultValue = "name") String sortBy,
-            @RequestParam(defaultValue = "asc") String sortDir,
-            @RequestParam(required = false) String ownerId) {
-
-        // If caller provided an ownerId, route to the owner-specific service
-        // This keeps backward compatibility for callers using the public
-        // /api/items endpoint with ?ownerId=<id>
-        if (ownerId != null && !ownerId.isBlank()) {
-            Page<ItemDTO> items = itemService.getItemsByOwner(ownerId, page, size);
-            return ResponseEntity.ok(items);
-        }
-
-        Page<ItemDTO> items = itemService.getAvailableItems(page, size, sortBy, sortDir);
-        return ResponseEntity.ok(items);
-    }
-
-    /**
-     * Get item by ID
-     * GET /api/items/{id}
-     */
-    @GetMapping("/{id}")
-    public ResponseEntity<?> getItemById(@PathVariable String id) {
-        try {
-            ItemDTO item = itemService.getItemById(id);
-            return ResponseEntity.ok(item);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        }
-    }
-
-    /**
-     * Search available items
-     * GET /api/items/search
-     * Query params: q (search term), page (default: 0), size (default: 10)
-     */
-    @GetMapping("/search")
-    public ResponseEntity<Page<ItemDTO>> searchItems(
-            @RequestParam(required = true) String q,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
-        
-        Page<ItemDTO> items = itemService.searchAvailableItems(q, page, size);
-        return ResponseEntity.ok(items);
-    }
-
-    /**
-     * Get items by category
-     * GET /api/items/category/{categoryId}
-     * Query params: page (default: 0), size (default: 10)
-     */
-    @GetMapping("/category/{categoryId}")
-    public ResponseEntity<?> getItemsByCategory(
-            @PathVariable String categoryId,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
-        
-        try {
-            Page<ItemDTO> items = itemService.getAvailableItemsByCategory(categoryId, page, size);
-            return ResponseEntity.ok(items);
-        } catch (IllegalArgumentException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Invalid category");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Get items by owner
-     * GET /api/items/owner/{ownerId}
-     * Query params: page (default: 0), size (default: 10)
-     */
-    @GetMapping("/owner/{ownerId}")
-    public ResponseEntity<?> getItemsByOwner(
-            @PathVariable String ownerId,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size) {
-        
-        try {
-            Page<ItemDTO> items = itemService.getItemsByOwner(ownerId, page, size);
-            return ResponseEntity.ok(items);
-        } catch (IllegalArgumentException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Invalid owner");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Get current user's items
-     * GET /api/items/my-items
-     * Request header: X-User-Id (required for authentication)
-     */
-    @GetMapping("/my-items")
-    public ResponseEntity<?> getMyItems(
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            Page<ItemDTO> items = itemService.getItemsByOwner(userId, page, size);
-            return ResponseEntity.ok(items);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to retrieve items");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Update an item
-     * PUT /api/items/{id}
-     * Request body: UpdateItemRequest (optional fields: name, description, condition, deposit, images, isAvailable)
-     * Request header: X-User-Id (required for owner verification)
-     */
-    @PutMapping("/{id}")
-    public ResponseEntity<?> updateItem(
-            @PathVariable String id,
-            @Valid @RequestBody UpdateItemRequest request,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            ItemDTO updatedItem = itemService.updateItem(id, request, userId);
-            return ResponseEntity.ok(updatedItem);
-        } catch (com.locallend.locallend.exception.UnauthorizedItemAccessException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Access denied");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-        } catch (com.locallend.locallend.exception.ItemNotFoundException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to update item");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Toggle item availability
-     * PATCH /api/items/{id}/toggle-availability
-     * Request header: X-User-Id (required for owner verification)
-     */
-    @PatchMapping("/{id}/toggle-availability")
-    public ResponseEntity<?> toggleAvailability(
-            @PathVariable String id,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            ItemDTO updatedItem = itemService.toggleAvailability(id, userId);
-            return ResponseEntity.ok(updatedItem);
-        } catch (com.locallend.locallend.exception.UnauthorizedItemAccessException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Access denied");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-        } catch (com.locallend.locallend.exception.ItemNotFoundException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to toggle availability");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Set item availability
-     * PATCH /api/items/{id}/availability
-     * Request body: { "isAvailable": true/false }
-     * Request header: X-User-Id (required for owner verification)
-     */
-    @PatchMapping("/{id}/availability")
-    public ResponseEntity<?> setAvailability(
-            @PathVariable String id,
-            @RequestBody Map<String, Boolean> request,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            Boolean isAvailable = request.get("isAvailable");
-            if (isAvailable == null) {
-                Map<String, String> error = new HashMap<>();
-                error.put("error", "Invalid request");
-                error.put("message", "isAvailable field is required");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-            }
-            
-            ItemDTO updatedItem = itemService.setAvailability(id, isAvailable, userId);
-            return ResponseEntity.ok(updatedItem);
-        } catch (com.locallend.locallend.exception.UnauthorizedItemAccessException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Access denied");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-        } catch (com.locallend.locallend.exception.ItemNotFoundException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to set availability");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-        }
-    }
-
-    /**
-     * Delete an item (soft delete)
-     * DELETE /api/items/{id}
-     * Request header: X-User-Id (required for owner verification)
-     */
-    @DeleteMapping("/{id}")
-    public ResponseEntity<?> deleteItem(
-            @PathVariable String id,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            itemService.deleteItem(id, userId);
-            Map<String, String> response = new HashMap<>();
-            response.put("message", "Item deleted successfully");
-            return ResponseEntity.ok(response);
-        } catch (com.locallend.locallend.exception.UnauthorizedItemAccessException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Access denied");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-        } catch (com.locallend.locallend.exception.ItemNotFoundException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to delete item");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        }
-    }
-
-    /**
-     * Reactivate a soft-deleted item (for testing purposes)
-     * POST /api/items/{id}/reactivate
-     * Request header: X-User-Id (required for owner verification)
-     */
-    @PostMapping("/{id}/reactivate")
-    public ResponseEntity<?> reactivateItem(
-            @PathVariable String id,
-            @RequestHeader(value = "X-User-Id", required = true) String userId) {
-        
-        try {
-            ItemDTO item = itemService.reactivateItem(id, userId);
-            return ResponseEntity.ok(item);
-        } catch (com.locallend.locallend.exception.UnauthorizedItemAccessException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Access denied");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-        } catch (com.locallend.locallend.exception.ItemNotFoundException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Item not found");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-        } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", "Failed to reactivate item");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/RatingController.java b/backend/src/main/java/com/locallend/locallend/controller/RatingController.java
deleted file mode 100644
index 21df15ea27e346791cebaf6416bc33b2836a5f59..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/RatingController.java
+++ /dev/null
@@ -1,531 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.request.RatingCreateDto;
-import com.locallend.locallend.dto.response.RatingResponseDto;
-import com.locallend.locallend.dto.response.RatingStatsResponse;
-import com.locallend.locallend.exception.ValidationException;
-import com.locallend.locallend.model.Rating;
-import com.locallend.locallend.model.RatingType;
-import com.locallend.locallend.service.RatingService;
-import com.locallend.locallend.util.RatingMapper;
-import com.locallend.locallend.util.SecurityUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * REST Controller for Rating management operations.
- * Provides comprehensive API endpoints for creating and retrieving ratings.
- * Issue #25: Rating Controller APIs
- */
-@RestController
-@RequestMapping("/api/ratings")
-@Validated
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class RatingController {
-
-    private static final Logger logger = LoggerFactory.getLogger(RatingController.class);
-
-    private final RatingService ratingService;
-    private final RatingMapper ratingMapper;
-
-    public RatingController(RatingService ratingService, RatingMapper ratingMapper) {
-        this.ratingService = ratingService;
-        this.ratingMapper = ratingMapper;
-    }
-
-    /**
-     * Create a new rating
-     * POST /api/ratings
-     */
-    @PostMapping
-    public ResponseEntity<?> createRating(@Valid @RequestBody RatingCreateDto request) {
-        
-        logger.info("Request to create rating with type: {}", request.getRatingType());
-
-        try {
-            String raterId = SecurityUtils.getCurrentUserId();
-            Rating rating;
-            
-            // Route to appropriate service method based on rating type
-            if (request.getRatingType() == RatingType.USER_TO_ITEM) {
-                // Item rating
-                if (request.getItemId() == null || request.getItemId().trim().isEmpty()) {
-                    throw new ValidationException("Item ID is required for item ratings");
-                }
-                rating = ratingService.createItemRating(
-                    raterId, 
-                    request.getItemId(), 
-                    request.getRatingValue(),
-                    request.getComment(),
-                    request.getIsAnonymous() != null ? request.getIsAnonymous() : false
-                );
-            } else {
-                // User-to-user rating (USER_TO_USER, OWNER_TO_BORROWER, BORROWER_TO_OWNER)
-                if (request.getRateeId() == null || request.getRateeId().trim().isEmpty()) {
-                    throw new ValidationException("Ratee ID is required for user ratings");
-                }
-                rating = ratingService.createUserRating(
-                    raterId,
-                    request.getRateeId(),
-                    request.getRatingType(),
-                    request.getRatingValue(),
-                    request.getComment(),
-                    request.getBookingId()
-                );
-            }
-
-            RatingResponseDto responseDto = ratingMapper.toResponseDto(rating);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Rating created successfully");
-            response.put("data", responseDto);
-
-            return ResponseEntity.status(HttpStatus.CREATED).body(response);
-
-        } catch (ValidationException e) {
-            logger.error("Rating validation failed: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "VALIDATION_ERROR");
-
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-
-        } catch (Exception e) {
-            logger.error("Unexpected error creating rating: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Internal server error: " + e.getMessage());
-            errorResponse.put("error_code", "INTERNAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get ratings for a user
-     * GET /api/ratings/user/{userId}
-     */
-    @GetMapping("/user/{userId}")
-    public ResponseEntity<?> getUserRatings(
-            @PathVariable @NotBlank(message = "User ID is required") String userId) {
-
-        logger.info("Request to get ratings for user: {}", userId);
-
-        try {
-            List<Rating> ratings = ratingService.getRatingsReceivedByUser(userId);
-            List<RatingResponseDto> responseDtos = ratingMapper.toResponseDtoList(ratings);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "User ratings retrieved successfully");
-            response.put("data", responseDtos);
-            response.put("count", responseDtos.size());
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving user ratings: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving user ratings");
-            errorResponse.put("error_code", "RETRIEVAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get ratings for an item
-     * GET /api/ratings/item/{itemId}
-     */
-    @GetMapping("/item/{itemId}")
-    public ResponseEntity<?> getItemRatings(
-            @PathVariable @NotBlank(message = "Item ID is required") String itemId) {
-
-        logger.info("Request to get ratings for item: {}", itemId);
-
-        try {
-            List<Rating> ratings = ratingService.getItemRatings(itemId);
-            List<RatingResponseDto> responseDtos = ratingMapper.toResponseDtoList(ratings);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Item ratings retrieved successfully");
-            response.put("data", responseDtos);
-            response.put("count", responseDtos.size());
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving item ratings: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving item ratings");
-            errorResponse.put("error_code", "RETRIEVAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get ratings for a booking
-     * GET /api/ratings/booking/{bookingId}
-     */
-    @GetMapping("/booking/{bookingId}")
-    public ResponseEntity<?> getBookingRatings(
-            @PathVariable @NotBlank(message = "Booking ID is required") String bookingId) {
-
-        logger.info("Request to get ratings for booking: {}", bookingId);
-
-        try {
-            // Filter ratings by booking ID from user and item ratings
-            // The existing service doesn't have a specific getByBookingId method
-            // For now, we'll return empty list and log a note
-            logger.warn("Booking-specific rating retrieval not yet implemented in service layer");
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Booking ratings retrieved successfully");
-            response.put("data", List.of());
-            response.put("count", 0);
-            response.put("booking_id", bookingId);
-            response.put("note", "Booking-specific queries to be added in future iteration");
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving booking ratings: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving booking ratings");
-            errorResponse.put("error_code", "RETRIEVAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get ratings given by current user
-     * GET /api/ratings/my-ratings
-     */
-    @GetMapping("/my-ratings")
-    public ResponseEntity<?> getMyRatings() {
-
-        String userId = SecurityUtils.getCurrentUserId();
-        logger.info("Request to get ratings by user: {}", userId);
-
-        try {
-            List<Rating> ratings = ratingService.getRatingsByRater(userId);
-            List<RatingResponseDto> responseDtos = ratingMapper.toResponseDtoList(ratings);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "My ratings retrieved successfully");
-            response.put("data", responseDtos);
-            response.put("count", responseDtos.size());
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving user's ratings: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving your ratings");
-            errorResponse.put("error_code", "RETRIEVAL_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get rating statistics for a user
-     * GET /api/ratings/user/{userId}/stats
-     */
-    @GetMapping("/user/{userId}/stats")
-    public ResponseEntity<?> getUserRatingStats(
-            @PathVariable @NotBlank(message = "User ID is required") String userId) {
-
-        logger.info("Request to get rating stats for user: {}", userId);
-
-        try {
-            RatingService.RatingStatistics stats = ratingService.getUserRatingStatistics(userId);
-            
-            // Convert RatingStatistics to RatingStatsResponse
-            RatingStatsResponse response = convertToStatsResponse(stats, userId, "USER");
-
-            Map<String, Object> responseMap = new HashMap<>();
-            responseMap.put("success", true);
-            responseMap.put("message", "User rating stats retrieved successfully");
-            responseMap.put("data", response);
-
-            return ResponseEntity.ok(responseMap);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving user rating stats: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving user rating statistics");
-            errorResponse.put("error_code", "STATS_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get rating statistics for an item
-     * GET /api/ratings/item/{itemId}/stats
-     */
-    @GetMapping("/item/{itemId}/stats")
-    public ResponseEntity<?> getItemRatingStats(
-            @PathVariable @NotBlank(message = "Item ID is required") String itemId) {
-
-        logger.info("Request to get rating stats for item: {}", itemId);
-
-        try {
-            RatingService.RatingStatistics stats = ratingService.getItemRatingStatistics(itemId);
-            
-            // Convert RatingStatistics to RatingStatsResponse
-            RatingStatsResponse response = convertToStatsResponse(stats, itemId, "ITEM");
-
-            Map<String, Object> responseMap = new HashMap<>();
-            responseMap.put("success", true);
-            responseMap.put("message", "Item rating stats retrieved successfully");
-            responseMap.put("data", response);
-
-            return ResponseEntity.ok(responseMap);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving item rating stats: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error retrieving item rating statistics");
-            errorResponse.put("error_code", "STATS_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Update an existing rating
-     * PUT /api/ratings/{ratingId}
-     */
-    @PutMapping("/{ratingId}")
-    public ResponseEntity<?> updateRating(
-            @PathVariable @NotBlank(message = "Rating ID is required") String ratingId,
-            @RequestParam @Min(value = 1, message = "Rating must be between 1 and 5") @Min(value = 5) Integer ratingValue,
-            @RequestParam(required = false) String comment) {
-
-        String userId = SecurityUtils.getCurrentUserId();
-        logger.info("Request to update rating {} by user: {}", ratingId, userId);
-
-        try {
-            Rating updatedRating = ratingService.updateRating(ratingId, userId, ratingValue, comment);
-            RatingResponseDto responseDto = ratingMapper.toResponseDto(updatedRating);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Rating updated successfully");
-            response.put("data", responseDto);
-
-            return ResponseEntity.ok(response);
-
-        } catch (ValidationException e) {
-            logger.error("Rating update failed: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "VALIDATION_ERROR");
-
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-
-        } catch (Exception e) {
-            logger.error("Error updating rating: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error updating rating: " + e.getMessage());
-            errorResponse.put("error_code", "UPDATE_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Delete a rating
-     * DELETE /api/ratings/{ratingId}
-     */
-    @DeleteMapping("/{ratingId}")
-    public ResponseEntity<?> deleteRating(
-            @PathVariable @NotBlank(message = "Rating ID is required") String ratingId) {
-
-        String userId = SecurityUtils.getCurrentUserId();
-        logger.info("Request to delete rating {} by user: {}", ratingId, userId);
-
-        try {
-            ratingService.deleteRating(ratingId, userId);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Rating deleted successfully");
-
-            return ResponseEntity.ok(response);
-
-        } catch (ValidationException e) {
-            logger.error("Rating deletion failed: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", e.getMessage());
-            errorResponse.put("error_code", "VALIDATION_ERROR");
-
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(errorResponse);
-
-        } catch (Exception e) {
-            logger.error("Error deleting rating: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error deleting rating: " + e.getMessage());
-            errorResponse.put("error_code", "DELETE_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-    /**
-     * Get a specific rating by ID
-     * GET /api/ratings/{ratingId}
-     */
-    @GetMapping("/{ratingId}")
-    public ResponseEntity<?> getRatingById(
-            @PathVariable @NotBlank(message = "Rating ID is required") String ratingId) {
-
-        logger.info("Request to get rating: {}", ratingId);
-
-        try {
-            Rating rating = ratingService.getRatingById(ratingId);
-            RatingResponseDto responseDto = ratingMapper.toResponseDto(rating);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("message", "Rating retrieved successfully");
-            response.put("data", responseDto);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error retrieving rating: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Rating not found");
-            errorResponse.put("error_code", "NOT_FOUND");
-
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
-        }
-    }
-    /**
-     * Check if a booking can be rated by the current user
-     * GET /api/ratings/can-rate/{bookingId}
-     * Issue #26: Booking-Rating Integration
-     */
-    @GetMapping("/can-rate/{bookingId}")
-    public ResponseEntity<?> canRateBooking(
-            @PathVariable @NotBlank(message = "Booking ID is required") String bookingId) {
-
-        String userId = SecurityUtils.getCurrentUserId();
-        logger.info("Request to check if booking {} can be rated by user: {}", bookingId, userId);
-
-        try {
-            boolean canRate = ratingService.canRateBooking(bookingId, userId);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("success", true);
-            response.put("can_rate", canRate);
-            response.put("booking_id", bookingId);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            logger.error("Error checking if booking can be rated: {}", e.getMessage());
-
-            Map<String, Object> errorResponse = new HashMap<>();
-            errorResponse.put("success", false);
-            errorResponse.put("message", "Error checking rating eligibility");
-            errorResponse.put("error_code", "CHECK_ERROR");
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
-        }
-    }
-
-
-    // Helper methods
-
-    /**
-     * Convert RatingService.RatingStatistics to RatingStatsResponse DTO
-     */
-    private RatingStatsResponse convertToStatsResponse(RatingService.RatingStatistics stats, String subjectId, String subjectType) {
-        RatingStatsResponse response = new RatingStatsResponse(
-            subjectId,
-            subjectType,
-            stats.getAverageRating(),
-            (long) stats.getTotalRatings()
-        );
-
-        // Convert rating distribution array to map
-        Map<String, Long> distributionMap = new HashMap<>();
-        int[] distribution = stats.getRatingDistribution();
-        distributionMap.put("1", (long) distribution[0]);
-        distributionMap.put("2", (long) distribution[1]);
-        distributionMap.put("3", (long) distribution[2]);
-        distributionMap.put("4", (long) distribution[3]);
-        distributionMap.put("5", (long) distribution[4]);
-        
-        response.setRatingDistribution(distributionMap);
-
-        return response;
-    }
-
-    /**
-     * Global exception handler for validation errors
-     */
-    @ExceptionHandler(org.springframework.web.bind.MethodArgumentNotValidException.class)
-    public ResponseEntity<?> handleValidationExceptions(
-            org.springframework.web.bind.MethodArgumentNotValidException ex) {
-
-        Map<String, String> errors = new HashMap<>();
-        ex.getBindingResult().getFieldErrors().forEach(error ->
-            errors.put(error.getField(), error.getDefaultMessage()));
-
-        Map<String, Object> errorResponse = new HashMap<>();
-        errorResponse.put("success", false);
-        errorResponse.put("message", "Validation failed");
-        errorResponse.put("error_code", "VALIDATION_ERROR");
-        errorResponse.put("errors", errors);
-
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/controller/UserController.java b/backend/src/main/java/com/locallend/locallend/controller/UserController.java
deleted file mode 100644
index 8687c9d88da8259778b247aa739777e0d78f36c4..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/controller/UserController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.locallend.locallend.controller;
-
-import com.locallend.locallend.dto.request.UserUpdateDto;
-import com.locallend.locallend.dto.response.UserPublicDto;
-import com.locallend.locallend.dto.response.UserResponseDto;
-import com.locallend.locallend.exception.BusinessException;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.service.UserQueryService;
-import com.locallend.locallend.service.UserService;
-import com.locallend.locallend.util.SecurityUtils;
-import com.locallend.locallend.util.UserMapper;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/** 
-* REST controller to manage authenticated user operations and public user queries.
-* Handles profile management, public info lookup, and user search.
-**/
-
-@RestController
-@RequestMapping("/api/users")
-public class UserController {
-
-	@Autowired
-	private UserService userService;
-
-	@Autowired
-	private UserQueryService userQueryService;
-
-	@Autowired
-	private UserMapper userMapper;
-
-	/**
-	 * Get current user's profile.
-	 * Extracts user ID from JWT token in SecurityContext.
-	 * 
-	 * @return Full user profile
-	 */
-	@GetMapping("/profile")
-	public ResponseEntity<UserResponseDto> getProfile() {
-		String userId = SecurityUtils.getCurrentUserId();
-		User user = userQueryService.findById(userId)
-				.orElseThrow(() -> new BusinessException("User not found"));
-		return ResponseEntity.ok(userMapper.toUserResponseDto(user));
-	}
-
-	/**
-	 * Update current user's profile.
-	 * Extracts user ID from JWT token in SecurityContext.
-	 * 
-	 * @param updateDto Profile update data
-	 * @return Updated user profile
-	 */
-	@PutMapping("/profile")
-	public ResponseEntity<UserResponseDto> updateProfile(@Valid @RequestBody UserUpdateDto updateDto) {
-		String userId = SecurityUtils.getCurrentUserId();
-		User updated = userService.updateProfile(userId,
-				updateDto.getName(),
-				updateDto.getPhoneNumber(),
-				updateDto.getProfileImageUrl());
-		return ResponseEntity.ok(userMapper.toUserResponseDto(updated));
-	}
-
-	/**
-	 * Get public information about any user.
-	 * Does not expose sensitive information like email or phone.
-	 * 
-	 * @param id User ID to lookup
-	 * @return Public user information
-	 */
-	@GetMapping("/{id}/public")
-	public ResponseEntity<UserPublicDto> getPublicInfo(@PathVariable String id) {
-		User user = userQueryService.findById(id)
-				.orElseThrow(() -> new BusinessException("User not found"));
-		return ResponseEntity.ok(userMapper.toUserPublicDto(user));
-	}
-
-	/**
-	 * Search active users by name or username.
-	 * Returns paginated results with only public information.
-	 * 
-	 * @param term Search term (case-insensitive)
-	 * @param page Page number (default: 0)
-	 * @param size Page size (default: 10)
-	 * @return Page of matching users (public info only)
-	 */
-	@GetMapping("/search")
-	public ResponseEntity<Page<UserPublicDto>> search(
-			@RequestParam String term,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "10") int size) {
-		Page<User> users = userQueryService.searchActiveUsers(term, page, size);
-		Page<UserPublicDto> result = users.map(userMapper::toUserPublicDto);
-		return ResponseEntity.ok(result);
-	}
-}
-
diff --git a/backend/src/main/java/com/locallend/locallend/dto/CategoryDto.java b/backend/src/main/java/com/locallend/locallend/dto/CategoryDto.java
deleted file mode 100644
index 49d236b6ed4944ac23e76ac8ca8cb05cf0fe089c..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/CategoryDto.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.locallend.locallend.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.time.LocalDateTime;
-
-public class CategoryDto {
-
-    @JsonProperty("id")
-    private String id;
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("description")
-    private String description;
-
-    @JsonProperty("parent_category_id")
-    private String parentCategoryId;
-
-    @JsonProperty("parent_category_name")
-    private String parentCategoryName;
-
-    @JsonProperty("is_active")
-    private boolean isActive;
-
-    @JsonProperty("item_count")
-    private long itemCount;
-
-    @JsonProperty("has_subcategories")
-    private boolean hasSubcategories;
-
-    @JsonProperty("created_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private LocalDateTime createdAt;
-
-    @JsonProperty("updated_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private LocalDateTime updatedAt;
-
-    public CategoryDto() {}
-
-    public CategoryDto(String id, String name, String description, String parentCategoryId,
-                       String parentCategoryName, boolean isActive, long itemCount,
-                       boolean hasSubcategories, LocalDateTime createdAt, LocalDateTime updatedAt) {
-        this.id = id;
-        this.name = name;
-        this.description = description;
-        this.parentCategoryId = parentCategoryId;
-        this.parentCategoryName = parentCategoryName;
-        this.isActive = isActive;
-        this.itemCount = itemCount;
-        this.hasSubcategories = hasSubcategories;
-        this.createdAt = createdAt;
-        this.updatedAt = updatedAt;
-    }
-
-    public static class Builder {
-        private CategoryDto categoryDto = new CategoryDto();
-
-        public Builder id(String id) { categoryDto.id = id; return this; }
-        public Builder name(String name) { categoryDto.name = name; return this; }
-        public Builder description(String description) { categoryDto.description = description; return this; }
-        public Builder parentCategoryId(String parentCategoryId) { categoryDto.parentCategoryId = parentCategoryId; return this; }
-        public Builder parentCategoryName(String parentCategoryName) { categoryDto.parentCategoryName = parentCategoryName; return this; }
-        public Builder isActive(boolean isActive) { categoryDto.isActive = isActive; return this; }
-        public Builder itemCount(long itemCount) { categoryDto.itemCount = itemCount; return this; }
-        public Builder hasSubcategories(boolean hasSubcategories) { categoryDto.hasSubcategories = hasSubcategories; return this; }
-        public Builder createdAt(LocalDateTime createdAt) { categoryDto.createdAt = createdAt; return this; }
-        public Builder updatedAt(LocalDateTime updatedAt) { categoryDto.updatedAt = updatedAt; return this; }
-        public CategoryDto build() { return categoryDto; }
-    }
-
-    public static Builder builder() { return new Builder(); }
-
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getParentCategoryId() { return parentCategoryId; }
-    public void setParentCategoryId(String parentCategoryId) { this.parentCategoryId = parentCategoryId; }
-
-    public String getParentCategoryName() { return parentCategoryName; }
-    public void setParentCategoryName(String parentCategoryName) { this.parentCategoryName = parentCategoryName; }
-
-    public boolean isActive() { return isActive; }
-    public void setActive(boolean active) { isActive = active; }
-
-    public long getItemCount() { return itemCount; }
-    public void setItemCount(long itemCount) { this.itemCount = itemCount; }
-
-    public boolean isHasSubcategories() { return hasSubcategories; }
-    public void setHasSubcategories(boolean hasSubcategories) { this.hasSubcategories = hasSubcategories; }
-
-    public LocalDateTime getCreatedAt() { return createdAt; }
-    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
-
-    public LocalDateTime getUpdatedAt() { return updatedAt; }
-    public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/CreateCategoryRequest.java b/backend/src/main/java/com/locallend/locallend/dto/CreateCategoryRequest.java
deleted file mode 100644
index 784310f1e8c810770d09a95521f8d410414776e7..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/CreateCategoryRequest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.locallend.locallend.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import jakarta.validation.constraints.Pattern;
-
-public class CreateCategoryRequest {
-
-    @NotBlank(message = "Category name is required")
-    @Size(min = 2, max = 50, message = "Category name must be between 2 and 50 characters")
-    @Pattern(regexp = "^[a-zA-Z0-9\\s&-_.()]+$", message = "Category name contains invalid characters")
-    @JsonProperty("name")
-    private String name;
-
-    @Size(max = 200, message = "Description cannot exceed 200 characters")
-    @JsonProperty("description")
-    private String description;
-
-    @Size(max = 24, message = "Invalid parent category ID format")
-    @JsonProperty("parent_category_id")
-    private String parentCategoryId;
-
-    public CreateCategoryRequest() {}
-
-    public CreateCategoryRequest(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
-    public CreateCategoryRequest(String name, String description, String parentCategoryId) {
-        this.name = name;
-        this.description = description;
-        this.parentCategoryId = parentCategoryId;
-    }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name != null ? name.trim() : null; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description != null ? description.trim() : null; }
-
-    public String getParentCategoryId() { return parentCategoryId; }
-    public void setParentCategoryId(String parentCategoryId) { this.parentCategoryId = parentCategoryId != null ? parentCategoryId.trim() : null; }
-
-    public boolean hasParentCategory() { return parentCategoryId != null && !parentCategoryId.isEmpty(); }
-    public boolean hasDescription() { return description != null && !description.isEmpty(); }
-
-    @Override
-    public String toString() {
-        return "CreateCategoryRequest{" +
-                "name='" + name + '\'' +
-                ", description='" + description + '\'' +
-                ", parentCategoryId='" + parentCategoryId + '\'' +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/CreateItemRequest.java b/backend/src/main/java/com/locallend/locallend/dto/CreateItemRequest.java
deleted file mode 100644
index 004a39d74374afc4b507fc0d2dff86e2683cca8f..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/CreateItemRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.locallend.locallend.dto;
-
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-import java.util.List;
-
-public class CreateItemRequest {
-
-    @NotBlank
-    @Size(min = 3, max = 100)
-    private String name;
-
-    @Size(max = 500)
-    private String description;
-
-    @NotNull
-    private String categoryId;
-
-    @DecimalMin(value = "0.0", inclusive = true)
-    private Double deposit = 0.0;
-
-    private List<String> images;
-
-    private String condition; // NEW|EXCELLENT|GOOD|FAIR|POOR
-
-    public CreateItemRequest() {}
-
-    // Getters and setters
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCategoryId() { return categoryId; }
-    public void setCategoryId(String categoryId) { this.categoryId = categoryId; }
-
-    public Double getDeposit() { return deposit; }
-    public void setDeposit(Double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/ItemDTO.java b/backend/src/main/java/com/locallend/locallend/dto/ItemDTO.java
deleted file mode 100644
index 0de2e3992ba7d0dc8942cc36079fe7f8eb678a08..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/ItemDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.locallend.locallend.dto;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public class ItemDTO {
-    private String id;
-    private String name;
-    private String description;
-    private String condition;
-    private String status;
-    private double deposit;
-    private List<String> images;
-    private double averageRating;
-    private String ownerId;
-    private String ownerName;
-    private String categoryId;
-    private String categoryName;
-    private boolean canBeBorrowed;
-    private LocalDateTime createdAt;
-    private LocalDateTime updatedAt;
-
-    // Getters and setters
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-
-    public double getDeposit() { return deposit; }
-    public void setDeposit(double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public double getAverageRating() { return averageRating; }
-    public void setAverageRating(double averageRating) { this.averageRating = averageRating; }
-
-    public String getOwnerId() { return ownerId; }
-    public void setOwnerId(String ownerId) { this.ownerId = ownerId; }
-
-    public String getOwnerName() { return ownerName; }
-    public void setOwnerName(String ownerName) { this.ownerName = ownerName; }
-
-    public String getCategoryId() { return categoryId; }
-    public void setCategoryId(String categoryId) { this.categoryId = categoryId; }
-
-    public String getCategoryName() { return categoryName; }
-    public void setCategoryName(String categoryName) { this.categoryName = categoryName; }
-
-    public boolean isCanBeBorrowed() { return canBeBorrowed; }
-    public void setCanBeBorrowed(boolean canBeBorrowed) { this.canBeBorrowed = canBeBorrowed; }
-
-    public LocalDateTime getCreatedAt() { return createdAt; }
-    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
-
-    public LocalDateTime getUpdatedAt() { return updatedAt; }
-    public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/UpdateItemRequest.java b/backend/src/main/java/com/locallend/locallend/dto/UpdateItemRequest.java
deleted file mode 100644
index 03df4d5a538b3dc8e1030bbfcd1561402697b2d3..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/UpdateItemRequest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.locallend.locallend.dto;
-
-import java.util.List;
-
-public class UpdateItemRequest {
-    private String name;
-    private String description;
-    private String condition;
-    private Double deposit;
-    private List<String> images;
-    private Boolean isAvailable;
-
-    public UpdateItemRequest() {}
-
-    // Getters and setters
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public Double getDeposit() { return deposit; }
-    public void setDeposit(Double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public Boolean getIsAvailable() { return isAvailable; }
-    public void setIsAvailable(Boolean isAvailable) { this.isAvailable = isAvailable; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/BookingRequestDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/BookingRequestDto.java
deleted file mode 100644
index a8fb333e009150fa52dcca6847b1f4d1a4af6fb7..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/BookingRequestDto.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import jakarta.validation.constraints.*;
-import java.time.LocalDateTime;
-
-/**
- * DTO for creating new bookings in the LocalLend platform.
- */
-public class BookingRequestDto {
-
-    @NotBlank(message = "Item ID is required")
-    private String itemId;
-
-    @NotNull(message = "Start date is required")
-    @Future(message = "Start date must be in the future")
-    private LocalDateTime startDate;
-
-    @NotNull(message = "End date is required")
-    private LocalDateTime endDate;
-
-    @Size(max = 500, message = "Booking notes cannot exceed 500 characters")
-    private String bookingNotes;
-
-    @DecimalMin(value = "0.0", message = "Deposit amount cannot be negative")
-    @DecimalMax(value = "10000.0", message = "Deposit amount cannot exceed 10,000")
-    private Double depositAmount;
-
-    @Min(value = 1, message = "Duration must be at least 1 day")
-    @Max(value = 365, message = "Duration cannot exceed 365 days")
-    private Integer requestedDurationDays;
-
-    private Boolean acceptTerms = false;
-
-    public BookingRequestDto() {}
-
-    public BookingRequestDto(String itemId, LocalDateTime startDate, LocalDateTime endDate) {
-        this.itemId = itemId;
-        this.startDate = startDate;
-        this.endDate = endDate;
-    }
-
-    @AssertTrue(message = "End date must be after start date")
-    public boolean isValidDateRange() {
-        if (startDate == null || endDate == null) return true;
-        return endDate.isAfter(startDate);
-    }
-
-    @AssertTrue(message = "Must accept terms and conditions")
-    public boolean isTermsAccepted() {
-        return acceptTerms != null && acceptTerms;
-    }
-
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-    public LocalDateTime getStartDate() { return startDate; }
-    public void setStartDate(LocalDateTime startDate) { this.startDate = startDate; }
-    public LocalDateTime getEndDate() { return endDate; }
-    public void setEndDate(LocalDateTime endDate) { this.endDate = endDate; }
-    public String getBookingNotes() { return bookingNotes; }
-    public void setBookingNotes(String bookingNotes) { this.bookingNotes = bookingNotes; }
-    public Double getDepositAmount() { return depositAmount; }
-    public void setDepositAmount(Double depositAmount) { this.depositAmount = depositAmount; }
-    public Integer getRequestedDurationDays() { return requestedDurationDays; }
-    public void setRequestedDurationDays(Integer requestedDurationDays) { this.requestedDurationDays = requestedDurationDays; }
-    public Boolean getAcceptTerms() { return acceptTerms; }
-    public void setAcceptTerms(Boolean acceptTerms) { this.acceptTerms = acceptTerms; }
-
-    @Override
-    public String toString() {
-        return "BookingRequestDto{" +
-                "itemId='" + itemId + '\'' +
-                ", startDate=" + startDate +
-                ", endDate=" + endDate +
-                ", requestedDurationDays=" + requestedDurationDays +
-                ", acceptTerms=" + acceptTerms +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/ItemRequestDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/ItemRequestDto.java
deleted file mode 100644
index 41252690bf15329fcdf339af460691a0630a0334..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/ItemRequestDto.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-
-import java.util.List;
-
-public class ItemRequestDto {
-
-    @NotBlank(message = "Item name is required")
-    @Size(min = 2, max = 100)
-    @JsonProperty("name")
-    private String name;
-
-    @Size(max = 1000)
-    @JsonProperty("description")
-    private String description;
-
-    @JsonProperty("condition")
-    private String condition;
-
-    @Min(value = 0, message = "Deposit must be non-negative")
-    @JsonProperty("deposit")
-    private double deposit = 0.0;
-
-    @JsonProperty("images")
-    private List<String> images;
-
-    @JsonProperty("category_id")
-    private String categoryId;
-
-    @JsonProperty("owner_id")
-    private String ownerId;
-
-    public ItemRequestDto() {}
-
-    // Getters and setters
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public double getDeposit() { return deposit; }
-    public void setDeposit(double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public String getCategoryId() { return categoryId; }
-    public void setCategoryId(String categoryId) { this.categoryId = categoryId; }
-
-    public String getOwnerId() { return ownerId; }
-    public void setOwnerId(String ownerId) { this.ownerId = ownerId; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/ItemUpdateDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/ItemUpdateDto.java
deleted file mode 100644
index 708a21e422a5096e0bfbdd491ca98fe16024fc39..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/ItemUpdateDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * Partial update DTO for Item
- */
-public class ItemUpdateDto {
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("description")
-    private String description;
-
-    @JsonProperty("condition")
-    private String condition;
-
-    @JsonProperty("deposit")
-    private Double deposit;
-
-    @JsonProperty("images")
-    private List<String> images;
-
-    @JsonProperty("status")
-    private String status;
-
-    public ItemUpdateDto() {}
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public Double getDeposit() { return deposit; }
-    public void setDeposit(Double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/RatingCreateDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/RatingCreateDto.java
deleted file mode 100644
index 07baf8a3c8488222ce40fc4624a9d2b424213d48..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/RatingCreateDto.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import com.locallend.locallend.model.RatingType;
-import jakarta.validation.constraints.*;
-
-/**
- * DTO for creating a new rating.
- * Includes validation for rating values and cross-field validation for item ratings.
- * Issue #23: Rating Entity, Repository, DTO
- */
-public class RatingCreateDto {
-    
-    @NotBlank(message = "Ratee ID is required")
-    private String rateeId;
-    
-    private String itemId;
-    private String bookingId;
-    
-    @NotNull(message = "Rating type is required")
-    private RatingType ratingType;
-    
-    @NotNull(message = "Rating value is required")
-    @Min(value = 1, message = "Rating must be between 1 and 5")
-    @Max(value = 5, message = "Rating must be between 1 and 5")
-    private Integer ratingValue;
-    
-    @Size(max = 1000, message = "Comment cannot exceed 1000 characters")
-    private String comment;
-    
-    private Boolean isAnonymous = false;
-    
-    // Constructors
-    public RatingCreateDto() {}
-    
-    public RatingCreateDto(String rateeId, RatingType ratingType, Integer ratingValue) {
-        this.rateeId = rateeId;
-        this.ratingType = ratingType;
-        this.ratingValue = ratingValue;
-    }
-    
-    // Cross-field validation
-    @AssertTrue(message = "Item ID is required for item ratings")
-    public boolean isItemIdValidForType() {
-        if (ratingType == RatingType.USER_TO_ITEM) {
-            return itemId != null && !itemId.trim().isEmpty();
-        }
-        return true;
-    }
-    
-    // Getters and Setters
-    public String getRateeId() { return rateeId; }
-    public void setRateeId(String rateeId) { this.rateeId = rateeId; }
-    
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-    
-    public String getBookingId() { return bookingId; }
-    public void setBookingId(String bookingId) { this.bookingId = bookingId; }
-    
-    public RatingType getRatingType() { return ratingType; }
-    public void setRatingType(RatingType ratingType) { this.ratingType = ratingType; }
-    
-    public Integer getRatingValue() { return ratingValue; }
-    public void setRatingValue(Integer ratingValue) { this.ratingValue = ratingValue; }
-    
-    public String getComment() { return comment; }
-    public void setComment(String comment) { this.comment = comment; }
-    
-    public Boolean getIsAnonymous() { return isAnonymous; }
-    public void setIsAnonymous(Boolean isAnonymous) { this.isAnonymous = isAnonymous; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/UserLoginDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/UserLoginDto.java
deleted file mode 100644
index fff2d73d587256333dfd48b8f0d0ad4c0160185b..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/UserLoginDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import jakarta.validation.constraints.NotBlank;
-
-/**
- * DTO for user login request.
- */
-public class UserLoginDto {
-    @NotBlank(message = "Username or email is required")
-    private String usernameOrEmail;
-
-    @NotBlank(message = "Password is required")
-    private String password;
-
-    public UserLoginDto() {}
-
-    // Getters and Setters
-    public String getUsernameOrEmail() {
-        return usernameOrEmail;
-    }
-
-    public void setUsernameOrEmail(String usernameOrEmail) {
-        this.usernameOrEmail = usernameOrEmail;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/UserRegistrationDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/UserRegistrationDto.java
deleted file mode 100644
index eacd48f6128e496fa59842e0916b4d19b505809b..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/UserRegistrationDto.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-
-/**
- * DTO for user registration request.
- */
-public class UserRegistrationDto {
-    @NotBlank(message = "Username is required")
-    @Size(min = 3, max = 50, message = "Username must be between 3 and 50 characters")
-    private String username;
-
-    @NotBlank(message = "Name is required")
-    @Size(min = 2, max = 100, message = "Name must be between 2 and 100 characters")
-    private String name;
-
-    @NotBlank(message = "Email is required")
-    @Email(message = "Email must be valid")
-    private String email;
-
-    @NotBlank(message = "Password is required")
-    @Size(min = 8, message = "Password must be at least 8 characters")
-    private String password;
-
-    private String phoneNumber;
-
-    public UserRegistrationDto() {}
-
-    // Getters and Setters
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/request/UserUpdateDto.java b/backend/src/main/java/com/locallend/locallend/dto/request/UserUpdateDto.java
deleted file mode 100644
index bebfd7fe6a4e9806a3c9d70bc4b0f22f8bf7e485..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/request/UserUpdateDto.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.locallend.locallend.dto.request;
-
-import jakarta.validation.constraints.Size;
-
-/**
- * DTO for user profile update requests.
- */
-public class UserUpdateDto {
-    @Size(min = 2, max = 100, message = "Name must be between 2 and 100 characters")
-    private String name;
-
-    private String phoneNumber;
-
-    private String profileImageUrl;
-
-    public UserUpdateDto() {}
-
-    // Getters and Setters
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public String getProfileImageUrl() {
-        return profileImageUrl;
-    }
-
-    public void setProfileImageUrl(String profileImageUrl) {
-        this.profileImageUrl = profileImageUrl;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/BookingResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/BookingResponseDto.java
deleted file mode 100644
index 3e208e70ea1ed3fc42c6eb292ceb8d2314074a3c..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/BookingResponseDto.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.locallend.locallend.model.enums.BookingStatus;
-import java.time.LocalDateTime;
-
-/**
- * DTO for returning complete booking information to API consumers.
- */
-public class BookingResponseDto {
-
-    private String id;
-    private String itemId;
-    private String itemName;
-    private String itemImageUrl;
-    private String borrowerId;
-    private String borrowerName;
-    private String ownerId;
-    private String ownerName;
-    private BookingStatus status;
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
-    private LocalDateTime actualStartDate;
-    private LocalDateTime actualEndDate;
-    private String bookingNotes;
-    private String ownerNotes;
-    private Double depositAmount;
-    private Boolean depositPaid;
-    private LocalDateTime createdDate;
-    private LocalDateTime updatedDate;
-    private LocalDateTime confirmedDate;
-    private LocalDateTime pickupDate;
-    private LocalDateTime returnDate;
-    private LocalDateTime cancelledDate;
-    private String cancellationReason;
-    private Boolean isRated;
-    private Integer durationDays;
-
-    // Computed fields
-    private String statusDescription;
-    private String timeAgo;
-    private Long daysUntilStart;
-    private Long daysUntilEnd;
-    private Boolean canBeCancelled;
-    private Boolean canBeConfirmed;
-    private Boolean canBeActivated;
-    private Boolean canBeCompleted;
-    private Boolean isOverdue;
-    private Boolean requiresDeposit;
-
-    public BookingResponseDto() {}
-
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-    public String getItemName() { return itemName; }
-    public void setItemName(String itemName) { this.itemName = itemName; }
-    public String getItemImageUrl() { return itemImageUrl; }
-    public void setItemImageUrl(String itemImageUrl) { this.itemImageUrl = itemImageUrl; }
-    public String getBorrowerId() { return borrowerId; }
-    public void setBorrowerId(String borrowerId) { this.borrowerId = borrowerId; }
-    public String getBorrowerName() { return borrowerName; }
-    public void setBorrowerName(String borrowerName) { this.borrowerName = borrowerName; }
-    public String getOwnerId() { return ownerId; }
-    public void setOwnerId(String ownerId) { this.ownerId = ownerId; }
-    public String getOwnerName() { return ownerName; }
-    public void setOwnerName(String ownerName) { this.ownerName = ownerName; }
-    public BookingStatus getStatus() { return status; }
-    public void setStatus(BookingStatus status) { this.status = status; }
-    public LocalDateTime getStartDate() { return startDate; }
-    public void setStartDate(LocalDateTime startDate) { this.startDate = startDate; }
-    public LocalDateTime getEndDate() { return endDate; }
-    public void setEndDate(LocalDateTime endDate) { this.endDate = endDate; }
-    public LocalDateTime getActualStartDate() { return actualStartDate; }
-    public void setActualStartDate(LocalDateTime actualStartDate) { this.actualStartDate = actualStartDate; }
-    public LocalDateTime getActualEndDate() { return actualEndDate; }
-    public void setActualEndDate(LocalDateTime actualEndDate) { this.actualEndDate = actualEndDate; }
-    public String getBookingNotes() { return bookingNotes; }
-    public void setBookingNotes(String bookingNotes) { this.bookingNotes = bookingNotes; }
-    public String getOwnerNotes() { return ownerNotes; }
-    public void setOwnerNotes(String ownerNotes) { this.ownerNotes = ownerNotes; }
-    public Double getDepositAmount() { return depositAmount; }
-    public void setDepositAmount(Double depositAmount) { this.depositAmount = depositAmount; }
-    public Boolean getDepositPaid() { return depositPaid; }
-    public void setDepositPaid(Boolean depositPaid) { this.depositPaid = depositPaid; }
-    public LocalDateTime getCreatedDate() { return createdDate; }
-    public void setCreatedDate(LocalDateTime createdDate) { this.createdDate = createdDate; }
-    public LocalDateTime getUpdatedDate() { return updatedDate; }
-    public void setUpdatedDate(LocalDateTime updatedDate) { this.updatedDate = updatedDate; }
-    public LocalDateTime getConfirmedDate() { return confirmedDate; }
-    public void setConfirmedDate(LocalDateTime confirmedDate) { this.confirmedDate = confirmedDate; }
-    public LocalDateTime getPickupDate() { return pickupDate; }
-    public void setPickupDate(LocalDateTime pickupDate) { this.pickupDate = pickupDate; }
-    public LocalDateTime getReturnDate() { return returnDate; }
-    public void setReturnDate(LocalDateTime returnDate) { this.returnDate = returnDate; }
-    public LocalDateTime getCancelledDate() { return cancelledDate; }
-    public void setCancelledDate(LocalDateTime cancelledDate) { this.cancelledDate = cancelledDate; }
-    public String getCancellationReason() { return cancellationReason; }
-    public void setCancellationReason(String cancellationReason) { this.cancellationReason = cancellationReason; }
-    public Boolean getIsRated() { return isRated; }
-    public void setIsRated(Boolean isRated) { this.isRated = isRated; }
-    public Integer getDurationDays() { return durationDays; }
-    public void setDurationDays(Integer durationDays) { this.durationDays = durationDays; }
-    public String getStatusDescription() { return statusDescription; }
-    public void setStatusDescription(String statusDescription) { this.statusDescription = statusDescription; }
-    public String getTimeAgo() { return timeAgo; }
-    public void setTimeAgo(String timeAgo) { this.timeAgo = timeAgo; }
-    public Long getDaysUntilStart() { return daysUntilStart; }
-    public void setDaysUntilStart(Long daysUntilStart) { this.daysUntilStart = daysUntilStart; }
-    public Long getDaysUntilEnd() { return daysUntilEnd; }
-    public void setDaysUntilEnd(Long daysUntilEnd) { this.daysUntilEnd = daysUntilEnd; }
-    public Boolean getCanBeCancelled() { return canBeCancelled; }
-    public void setCanBeCancelled(Boolean canBeCancelled) { this.canBeCancelled = canBeCancelled; }
-    public Boolean getCanBeConfirmed() { return canBeConfirmed; }
-    public void setCanBeConfirmed(Boolean canBeConfirmed) { this.canBeConfirmed = canBeConfirmed; }
-    public Boolean getCanBeActivated() { return canBeActivated; }
-    public void setCanBeActivated(Boolean canBeActivated) { this.canBeActivated = canBeActivated; }
-    public Boolean getCanBeCompleted() { return canBeCompleted; }
-    public void setCanBeCompleted(Boolean canBeCompleted) { this.canBeCompleted = canBeCompleted; }
-    public Boolean getIsOverdue() { return isOverdue; }
-    public void setIsOverdue(Boolean isOverdue) { this.isOverdue = isOverdue; }
-    public Boolean getRequiresDeposit() { return requiresDeposit; }
-    public void setRequiresDeposit(Boolean requiresDeposit) { this.requiresDeposit = requiresDeposit; }
-
-    @Override
-    public String toString() {
-        return "BookingResponseDto{" +
-                "id='" + id + '\'' +
-                ", itemId='" + itemId + '\'' +
-                ", borrowerId='" + borrowerId + '\'' +
-                ", ownerId='" + ownerId + '\'' +
-                ", status=" + status +
-                ", startDate=" + startDate +
-                ", endDate=" + endDate +
-                ", durationDays=" + durationDays +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/CategoryResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/CategoryResponseDto.java
deleted file mode 100644
index b8112782f563f664b97e5f1c15cecd5f1530af17..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/CategoryResponseDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class CategoryResponseDto {
-
-    @JsonProperty("id")
-    private String id;
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("description")
-    private String description;
-
-    @JsonProperty("item_count")
-    private long itemCount;
-
-    @JsonProperty("is_active")
-    private boolean isActive;
-
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public long getItemCount() { return itemCount; }
-    public void setItemCount(long itemCount) { this.itemCount = itemCount; }
-
-    public boolean isActive() { return isActive; }
-    public void setActive(boolean active) { isActive = active; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/ItemResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/ItemResponseDto.java
deleted file mode 100644
index 8aa650f372fc4c767c3d01bedd576830dcb2e94a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/ItemResponseDto.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public class ItemResponseDto {
-
-    @JsonProperty("id")
-    private String id;
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("description")
-    private String description;
-
-    @JsonProperty("condition")
-    private String condition;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("deposit")
-    private double deposit;
-
-    @JsonProperty("images")
-    private List<String> images;
-
-    @JsonProperty("average_rating")
-    private double averageRating;
-
-    @JsonProperty("owner_id")
-    private String ownerId;
-
-    @JsonProperty("owner_name")
-    private String ownerName;
-
-    @JsonProperty("category_id")
-    private String categoryId;
-
-    @JsonProperty("category_name")
-    private String categoryName;
-
-    @JsonProperty("can_be_borrowed")
-    private boolean canBeBorrowed;
-
-    @JsonProperty("created_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private LocalDateTime createdAt;
-
-    @JsonProperty("updated_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private LocalDateTime updatedAt;
-
-    // Getters and setters
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-
-    public double getDeposit() { return deposit; }
-    public void setDeposit(double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public double getAverageRating() { return averageRating; }
-    public void setAverageRating(double averageRating) { this.averageRating = averageRating; }
-
-    public String getOwnerId() { return ownerId; }
-    public void setOwnerId(String ownerId) { this.ownerId = ownerId; }
-
-    public String getOwnerName() { return ownerName; }
-    public void setOwnerName(String ownerName) { this.ownerName = ownerName; }
-
-    public String getCategoryId() { return categoryId; }
-    public void setCategoryId(String categoryId) { this.categoryId = categoryId; }
-
-    public String getCategoryName() { return categoryName; }
-    public void setCategoryName(String categoryName) { this.categoryName = categoryName; }
-
-    public boolean isCanBeBorrowed() { return canBeBorrowed; }
-    public void setCanBeBorrowed(boolean canBeBorrowed) { this.canBeBorrowed = canBeBorrowed; }
-
-    public LocalDateTime getCreatedAt() { return createdAt; }
-    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
-
-    public LocalDateTime getUpdatedAt() { return updatedAt; }
-    public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/ItemSummaryDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/ItemSummaryDto.java
deleted file mode 100644
index 62c32462cdc31056daba6a71bbb0a116c6d87f87..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/ItemSummaryDto.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ItemSummaryDto {
-
-    @JsonProperty("id")
-    private String id;
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("thumbnail")
-    private String thumbnail;
-
-    @JsonProperty("category_name")
-    private String categoryName;
-
-    @JsonProperty("owner_name")
-    private String ownerName;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("condition")
-    private String condition;
-
-    @JsonProperty("deposit")
-    private double deposit;
-
-    @JsonProperty("average_rating")
-    private double averageRating;
-
-    // Getters and setters
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getThumbnail() { return thumbnail; }
-    public void setThumbnail(String thumbnail) { this.thumbnail = thumbnail; }
-
-    public String getCategoryName() { return categoryName; }
-    public void setCategoryName(String categoryName) { this.categoryName = categoryName; }
-
-    public String getOwnerName() { return ownerName; }
-    public void setOwnerName(String ownerName) { this.ownerName = ownerName; }
-
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-
-    public String getCondition() { return condition; }
-    public void setCondition(String condition) { this.condition = condition; }
-
-    public double getDeposit() { return deposit; }
-    public void setDeposit(double deposit) { this.deposit = deposit; }
-
-    public double getAverageRating() { return averageRating; }
-    public void setAverageRating(double averageRating) { this.averageRating = averageRating; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/JwtAuthResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/JwtAuthResponseDto.java
deleted file mode 100644
index 3645868f4c427fc46a272997751bb90105a8b9b5..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/JwtAuthResponseDto.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-/**
- * DTO for JWT authentication response.
- * Contains the JWT token and user information.
- */
-public class JwtAuthResponseDto {
-    private String token;
-    private String tokenType = "Bearer";
-    private UserResponseDto user;
-
-    public JwtAuthResponseDto() {}
-
-    public JwtAuthResponseDto(String token, UserResponseDto user) {
-        this.token = token;
-        this.user = user;
-    }
-
-    // Getters and Setters
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getTokenType() {
-        return tokenType;
-    }
-
-    public void setTokenType(String tokenType) {
-        this.tokenType = tokenType;
-    }
-
-    public UserResponseDto getUser() {
-        return user;
-    }
-
-    public void setUser(UserResponseDto user) {
-        this.user = user;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/RatingResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/RatingResponseDto.java
deleted file mode 100644
index 3274ed5bf80484e3c71c2b1df2c536405ca33ec0..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/RatingResponseDto.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.locallend.locallend.model.RatingType;
-import java.time.LocalDateTime;
-
-/**
- * Response DTO for Rating entity.
- * Includes computed fields (timeAgo, canEdit) and optional user/item names.
- * Issue #23: Rating Entity, Repository, DTO
- */
-public class RatingResponseDto {
-    
-    private String id;
-    private String raterId;
-    private String raterName;
-    private String rateeId;
-    private String rateeName;
-    private String itemId;
-    private String itemName;
-    private String bookingId;
-    private RatingType ratingType;
-    private Integer ratingValue;
-    private String comment;
-    private LocalDateTime createdDate;
-    private LocalDateTime updatedDate;
-    private Boolean isAnonymous;
-    private Integer helpfulCount;
-    private Boolean isVerified;
-    private String timeAgo;
-    private Boolean canEdit;
-    
-    // Constructors
-    public RatingResponseDto() {}
-    
-    // Getters and Setters
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-    
-    public String getRaterId() { return raterId; }
-    public void setRaterId(String raterId) { this.raterId = raterId; }
-    
-    public String getRaterName() { return raterName; }
-    public void setRaterName(String raterName) { this.raterName = raterName; }
-    
-    public String getRateeId() { return rateeId; }
-    public void setRateeId(String rateeId) { this.rateeId = rateeId; }
-    
-    public String getRateeName() { return rateeName; }
-    public void setRateeName(String rateeName) { this.rateeName = rateeName; }
-    
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-    
-    public String getItemName() { return itemName; }
-    public void setItemName(String itemName) { this.itemName = itemName; }
-    
-    public String getBookingId() { return bookingId; }
-    public void setBookingId(String bookingId) { this.bookingId = bookingId; }
-    
-    public RatingType getRatingType() { return ratingType; }
-    public void setRatingType(RatingType ratingType) { this.ratingType = ratingType; }
-    
-    public Integer getRatingValue() { return ratingValue; }
-    public void setRatingValue(Integer ratingValue) { this.ratingValue = ratingValue; }
-    
-    public String getComment() { return comment; }
-    public void setComment(String comment) { this.comment = comment; }
-    
-    public LocalDateTime getCreatedDate() { return createdDate; }
-    public void setCreatedDate(LocalDateTime createdDate) { this.createdDate = createdDate; }
-    
-    public LocalDateTime getUpdatedDate() { return updatedDate; }
-    public void setUpdatedDate(LocalDateTime updatedDate) { this.updatedDate = updatedDate; }
-    
-    public Boolean getIsAnonymous() { return isAnonymous; }
-    public void setIsAnonymous(Boolean isAnonymous) { this.isAnonymous = isAnonymous; }
-    
-    public Integer getHelpfulCount() { return helpfulCount; }
-    public void setHelpfulCount(Integer helpfulCount) { this.helpfulCount = helpfulCount; }
-    
-    public Boolean getIsVerified() { return isVerified; }
-    public void setIsVerified(Boolean isVerified) { this.isVerified = isVerified; }
-    
-    public String getTimeAgo() { return timeAgo; }
-    public void setTimeAgo(String timeAgo) { this.timeAgo = timeAgo; }
-    
-    public Boolean getCanEdit() { return canEdit; }
-    public void setCanEdit(Boolean canEdit) { this.canEdit = canEdit; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/RatingStatsResponse.java b/backend/src/main/java/com/locallend/locallend/dto/response/RatingStatsResponse.java
deleted file mode 100644
index 1a8a7986fa890f01b1ab60b7f58bb89cf13e7cdc..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/RatingStatsResponse.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
-
-/**
- * Response DTO for rating statistics.
- * Provides aggregated rating data for users or items.
- * Issue #25: Rating Controller APIs
- */
-public class RatingStatsResponse {
-
-    @JsonProperty("subject_id")
-    private String subjectId; // User ID or Item ID
-
-    @JsonProperty("subject_type")
-    private String subjectType; // "USER" or "ITEM"
-
-    @JsonProperty("average_rating")
-    private Double averageRating;
-
-    @JsonProperty("total_ratings")
-    private Long totalRatings;
-
-    @JsonProperty("rating_distribution")
-    private Map<String, Long> ratingDistribution; // "5" -> count, "4" -> count, etc.
-
-    @JsonProperty("recent_average")
-    private Double recentAverage; // Last 30 days
-
-    @JsonProperty("verified_ratings_count")
-    private Long verifiedRatingsCount;
-
-    // Constructors
-    public RatingStatsResponse() {}
-
-    public RatingStatsResponse(String subjectId, String subjectType, Double averageRating, Long totalRatings) {
-        this.subjectId = subjectId;
-        this.subjectType = subjectType;
-        this.averageRating = averageRating;
-        this.totalRatings = totalRatings;
-    }
-
-    // Getters and Setters
-    public String getSubjectId() { return subjectId; }
-    public void setSubjectId(String subjectId) { this.subjectId = subjectId; }
-
-    public String getSubjectType() { return subjectType; }
-    public void setSubjectType(String subjectType) { this.subjectType = subjectType; }
-
-    public Double getAverageRating() { return averageRating; }
-    public void setAverageRating(Double averageRating) { this.averageRating = averageRating; }
-
-    public Long getTotalRatings() { return totalRatings; }
-    public void setTotalRatings(Long totalRatings) { this.totalRatings = totalRatings; }
-
-    public Map<String, Long> getRatingDistribution() { return ratingDistribution; }
-    public void setRatingDistribution(Map<String, Long> ratingDistribution) { this.ratingDistribution = ratingDistribution; }
-
-    public Double getRecentAverage() { return recentAverage; }
-    public void setRecentAverage(Double recentAverage) { this.recentAverage = recentAverage; }
-
-    public Long getVerifiedRatingsCount() { return verifiedRatingsCount; }
-    public void setVerifiedRatingsCount(Long verifiedRatingsCount) { this.verifiedRatingsCount = verifiedRatingsCount; }
-
-    // Helper methods
-    public String getFormattedAverageRating() {
-        return averageRating != null ? String.format("%.1f", averageRating) : "N/A";
-    }
-
-    public boolean hasRatings() {
-        return totalRatings != null && totalRatings > 0;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/UserPublicDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/UserPublicDto.java
deleted file mode 100644
index e092b7af8cb956ddfaa56d44fa5c9666d24c6b3a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/UserPublicDto.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-/**
- * Public user information DTO.
- * Contains only publicly visible user information (no email, phone, etc.).
- */
-public class UserPublicDto {
-    private String id;
-    private String username;
-    private String name;
-    private String profileImageUrl;
-    private Double trustScore;
-    private Long itemCount;
-    
-    // Computed field for Issue #29
-    private String memberSince; // "Member since MMMM yyyy"
-
-    public UserPublicDto() {}
-
-    // Getters and Setters
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getProfileImageUrl() {
-        return profileImageUrl;
-    }
-
-    public void setProfileImageUrl(String profileImageUrl) {
-        this.profileImageUrl = profileImageUrl;
-    }
-
-    public Double getTrustScore() {
-        return trustScore;
-    }
-
-    public void setTrustScore(Double trustScore) {
-        this.trustScore = trustScore;
-    }
-
-    public Long getItemCount() {
-        return itemCount;
-    }
-
-    public void setItemCount(Long itemCount) {
-        this.itemCount = itemCount;
-    }
-    
-    public String getMemberSince() {
-        return memberSince;
-    }
-    
-    public void setMemberSince(String memberSince) {
-        this.memberSince = memberSince;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/dto/response/UserResponseDto.java b/backend/src/main/java/com/locallend/locallend/dto/response/UserResponseDto.java
deleted file mode 100644
index 0b890c47df6336fb9ad0baf219cad7845653082b..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/dto/response/UserResponseDto.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.locallend.locallend.dto.response;
-
-import java.time.LocalDateTime;
-
-/**
- * Full user response DTO for authenticated user operations.
- * Contains all non-sensitive user information.
- */
-public class UserResponseDto {
-    private String id;
-    private String username;
-    private String name;
-    private String email;
-    private String phoneNumber;
-    private String profileImageUrl;
-    private String role;
-    private Boolean isActive;
-    private LocalDateTime createdDate;
-    private Double trustScore;
-    private Long itemCount;
-    
-    // Computed fields for Issue #29
-    private String memberSince; // "Member since MMMM yyyy"
-    private Integer totalItemsShared; // Total items created by user
-    private Integer totalBookings; // Total bookings as owner or borrower
-
-    public UserResponseDto() {}
-
-    // Getters and Setters
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public String getProfileImageUrl() {
-        return profileImageUrl;
-    }
-
-    public void setProfileImageUrl(String profileImageUrl) {
-        this.profileImageUrl = profileImageUrl;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    public Boolean getIsActive() {
-        return isActive;
-    }
-
-    public void setIsActive(Boolean isActive) {
-        this.isActive = isActive;
-    }
-
-    public LocalDateTime getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(LocalDateTime createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public Double getTrustScore() {
-        return trustScore;
-    }
-
-    public void setTrustScore(Double trustScore) {
-        this.trustScore = trustScore;
-    }
-
-    public Long getItemCount() {
-        return itemCount;
-    }
-
-    public void setItemCount(Long itemCount) {
-        this.itemCount = itemCount;
-    }
-    
-    public String getMemberSince() {
-        return memberSince;
-    }
-    
-    public void setMemberSince(String memberSince) {
-        this.memberSince = memberSince;
-    }
-    
-    public Integer getTotalItemsShared() {
-        return totalItemsShared;
-    }
-    
-    public void setTotalItemsShared(Integer totalItemsShared) {
-        this.totalItemsShared = totalItemsShared;
-    }
-    
-    public Integer getTotalBookings() {
-        return totalBookings;
-    }
-    
-    public void setTotalBookings(Integer totalBookings) {
-        this.totalBookings = totalBookings;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/BookingConflictException.java b/backend/src/main/java/com/locallend/locallend/exception/BookingConflictException.java
deleted file mode 100644
index 3140b560f365b8722bc93e1291a826f1e7d349ea..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/BookingConflictException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a booking request conflicts with existing bookings or availability constraints.
- */
-public class BookingConflictException extends RuntimeException {
-    
-    private String itemId;
-    private String conflictingBookingId;
-
-    public BookingConflictException(String message) {
-        super(message);
-    }
-
-    public BookingConflictException(String message, String itemId) {
-        super(message);
-        this.itemId = itemId;
-    }
-
-    public BookingConflictException(String message, String itemId, String conflictingBookingId) {
-        super(message);
-        this.itemId = itemId;
-        this.conflictingBookingId = conflictingBookingId;
-    }
-
-    public BookingConflictException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public String getItemId() {
-        return itemId;
-    }
-
-    public String getConflictingBookingId() {
-        return conflictingBookingId;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/BookingNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/BookingNotFoundException.java
deleted file mode 100644
index 43057de68eb58c90ad3130252204a1a61903c604..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/BookingNotFoundException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a booking is not found by ID.
- */
-public class BookingNotFoundException extends RuntimeException {
-    
-    private String bookingId;
-
-    public BookingNotFoundException(String bookingId) {
-        super("Booking not found with ID: " + bookingId);
-        this.bookingId = bookingId;
-    }
-
-    public BookingNotFoundException(String bookingId, String message) {
-        super(message);
-        this.bookingId = bookingId;
-    }
-
-    public BookingNotFoundException(String bookingId, String message, Throwable cause) {
-        super(message, cause);
-        this.bookingId = bookingId;
-    }
-
-    public String getBookingId() {
-        return bookingId;
-    }
-
-    public static BookingNotFoundException withId(String bookingId) {
-        return new BookingNotFoundException(bookingId);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/BusinessException.java b/backend/src/main/java/com/locallend/locallend/exception/BusinessException.java
deleted file mode 100644
index 1e2d34d6fc9f306486d6a911cb3bcb76874b1bc1..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/BusinessException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when business rules are violated.
- * Examples: duplicate user, inactive user, invalid trust score, etc.
- */
-public class BusinessException extends RuntimeException {
-    public BusinessException(String message) {
-        super(message);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/CategoryNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/CategoryNotFoundException.java
deleted file mode 100644
index 282c4ca417663562b59472cc33bcf6c7a9470256..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/CategoryNotFoundException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.locallend.locallend.exception;
-
-public class CategoryNotFoundException extends RuntimeException {
-
-    private final String categoryId;
-    private final String categoryName;
-
-    public CategoryNotFoundException(String categoryId) {
-        super("Category with ID '" + categoryId + "' not found");
-        this.categoryId = categoryId;
-        this.categoryName = null;
-    }
-
-    public CategoryNotFoundException(String categoryName, boolean byName) {
-        super("Category with name '" + categoryName + "' not found");
-        this.categoryId = null;
-        this.categoryName = categoryName;
-    }
-
-    public CategoryNotFoundException(String message, String categoryId, String categoryName) {
-        super(message);
-        this.categoryId = categoryId;
-        this.categoryName = categoryName;
-    }
-
-    public static CategoryNotFoundException byId(String categoryId) {
-        return new CategoryNotFoundException(categoryId);
-    }
-
-    public static CategoryNotFoundException byName(String categoryName) {
-        return new CategoryNotFoundException(categoryName, true);
-    }
-
-    public String getCategoryId() { return categoryId; }
-    public String getCategoryName() { return categoryName; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/DuplicateResourceException.java b/backend/src/main/java/com/locallend/locallend/exception/DuplicateResourceException.java
deleted file mode 100644
index ba0c0f758c5900bfa9d3bc7b5ed8eb48d75b0461..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/DuplicateResourceException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when attempting to create a resource that already exists.
- * Examples: duplicate username, duplicate email, duplicate category name.
- */
-public class DuplicateResourceException extends RuntimeException {
-    private final String resourceType;
-    private final String fieldName;
-    private final String fieldValue;
-
-    public DuplicateResourceException(String resourceType, String fieldName, String fieldValue) {
-        super(String.format("%s with %s '%s' already exists", resourceType, fieldName, fieldValue));
-        this.resourceType = resourceType;
-        this.fieldName = fieldName;
-        this.fieldValue = fieldValue;
-    }
-
-    public DuplicateResourceException(String message) {
-        super(message);
-        this.resourceType = null;
-        this.fieldName = null;
-        this.fieldValue = null;
-    }
-
-    public String getResourceType() { 
-        return resourceType; 
-    }
-
-    public String getFieldName() { 
-        return fieldName; 
-    }
-
-    public String getFieldValue() { 
-        return fieldValue; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/GlobalExceptionHandler.java b/backend/src/main/java/com/locallend/locallend/exception/GlobalExceptionHandler.java
deleted file mode 100644
index 21fbe6c4783eb796cd84cfd6e618d0a1716bafd6..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package com.locallend.locallend.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.validation.FieldError;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-import org.springframework.web.servlet.NoHandlerFoundException;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Global exception handler for all controllers.
- * Converts exceptions to standardized error responses.
- */
-@ControllerAdvice
-public class GlobalExceptionHandler {
-
-    /**
-     * Handle BusinessException - domain/business logic violations.
-     * @param ex BusinessException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(BusinessException.class)
-    public ResponseEntity<ErrorResponse> handleBusinessException(BusinessException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-
-    /**
-     * Handle validation errors from @Valid annotation.
-     * @param ex MethodArgumentNotValidException
-     * @return Error response with 400 BAD REQUEST and field errors
-     */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseEntity<ValidationErrorResponse> handleValidationException(MethodArgumentNotValidException ex) {
-        Map<String, String> fieldErrors = new HashMap<>();
-        
-        ex.getBindingResult().getAllErrors().forEach((error) -> {
-            String fieldName = ((FieldError) error).getField();
-            String errorMessage = error.getDefaultMessage();
-            fieldErrors.put(fieldName, errorMessage);
-        });
-
-        ValidationErrorResponse error = new ValidationErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                "Validation failed",
-                fieldErrors,
-                LocalDateTime.now()
-        );
-        
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle custom ValidationException - for domain-specific validation errors.
-     * @param ex ValidationException
-     * @return Error response with 400 BAD REQUEST and field errors
-     */
-    @ExceptionHandler(ValidationException.class)
-    public ResponseEntity<ValidationErrorResponse> handleCustomValidationException(ValidationException ex) {
-        ValidationErrorResponse error = new ValidationErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                ex.getMessage(),
-                ex.getFieldErrors(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle DuplicateResourceException - when trying to create duplicate resource.
-     * @param ex DuplicateResourceException
-     * @return Error response with 409 CONFLICT
-     */
-    @ExceptionHandler(DuplicateResourceException.class)
-    public ResponseEntity<ErrorResponse> handleDuplicateResourceException(DuplicateResourceException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.CONFLICT.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.CONFLICT).body(error);
-    }
-    
-    /**
-     * Handle InvalidOperationException - when operation cannot be performed.
-     * @param ex InvalidOperationException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(InvalidOperationException.class)
-    public ResponseEntity<ErrorResponse> handleInvalidOperationException(InvalidOperationException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle InvalidStateTransitionException - when state transition is not allowed.
-     * @param ex InvalidStateTransitionException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(InvalidStateTransitionException.class)
-    public ResponseEntity<ErrorResponse> handleInvalidStateTransitionException(InvalidStateTransitionException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle InsufficientTrustScoreException - when user's trust score is too low.
-     * @param ex InsufficientTrustScoreException
-     * @return Error response with 403 FORBIDDEN
-     */
-    @ExceptionHandler(InsufficientTrustScoreException.class)
-    public ResponseEntity<ErrorResponse> handleInsufficientTrustScoreException(InsufficientTrustScoreException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.FORBIDDEN.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-    }
-    
-    /**
-     * Handle ItemNotAvailableException - when item is not available for booking.
-     * @param ex ItemNotAvailableException
-     * @return Error response with 409 CONFLICT
-     */
-    @ExceptionHandler(ItemNotAvailableException.class)
-    public ResponseEntity<ErrorResponse> handleItemNotAvailableException(ItemNotAvailableException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.CONFLICT.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.CONFLICT).body(error);
-    }
-    
-    /**
-     * Handle BookingConflictException - when booking dates conflict.
-     * @param ex BookingConflictException
-     * @return Error response with 409 CONFLICT
-     */
-    @ExceptionHandler(BookingConflictException.class)
-    public ResponseEntity<ErrorResponse> handleBookingConflictException(BookingConflictException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.CONFLICT.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.CONFLICT).body(error);
-    }
-    
-    /**
-     * Handle InvalidBookingPeriodException - when booking period is invalid.
-     * @param ex InvalidBookingPeriodException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(InvalidBookingPeriodException.class)
-    public ResponseEntity<ErrorResponse> handleInvalidBookingPeriodException(InvalidBookingPeriodException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle ResourceNotFoundException - generic resource not found.
-     * @param ex ResourceNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(ResourceNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleResourceNotFoundException(ResourceNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle CategoryNotFoundException - when category is not found.
-     * @param ex CategoryNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(CategoryNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleCategoryNotFoundException(CategoryNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle ItemNotFoundException - when item is not found.
-     * @param ex ItemNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(ItemNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleItemNotFoundException(ItemNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle UserNotFoundException - when user is not found.
-     * @param ex UserNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(UserNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleUserNotFoundException(UserNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle BookingNotFoundException - when booking is not found.
-     * @param ex BookingNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(BookingNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleBookingNotFoundException(BookingNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle RatingNotFoundException - when rating is not found.
-     * @param ex RatingNotFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(RatingNotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleRatingNotFoundException(RatingNotFoundException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle UnauthorizedItemAccessException - when user tries to access/modify item they don't own.
-     * @param ex UnauthorizedItemAccessException
-     * @return Error response with 403 FORBIDDEN
-     */
-    @ExceptionHandler(UnauthorizedItemAccessException.class)
-    public ResponseEntity<ErrorResponse> handleUnauthorizedItemAccessException(UnauthorizedItemAccessException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.FORBIDDEN.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-    }
-    
-    /**
-     * Handle UnauthorizedAccessException - generic unauthorized access.
-     * @param ex UnauthorizedAccessException
-     * @return Error response with 403 FORBIDDEN
-     */
-    @ExceptionHandler(UnauthorizedAccessException.class)
-    public ResponseEntity<ErrorResponse> handleUnauthorizedAccessException(UnauthorizedAccessException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.FORBIDDEN.value(),
-                ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-    }
-    
-    /**
-     * Handle Spring Security AuthenticationException - authentication failures.
-     * @param ex AuthenticationException
-     * @return Error response with 401 UNAUTHORIZED
-     */
-    @ExceptionHandler(AuthenticationException.class)
-    public ResponseEntity<ErrorResponse> handleAuthenticationException(AuthenticationException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.UNAUTHORIZED.value(),
-                "Authentication failed: " + ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error);
-    }
-    
-    /**
-     * Handle Spring Security BadCredentialsException - invalid username/password.
-     * @param ex BadCredentialsException
-     * @return Error response with 401 UNAUTHORIZED
-     */
-    @ExceptionHandler(BadCredentialsException.class)
-    public ResponseEntity<ErrorResponse> handleBadCredentialsException(BadCredentialsException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.UNAUTHORIZED.value(),
-                "Invalid username or password",
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error);
-    }
-    
-    /**
-     * Handle Spring Security AccessDeniedException - insufficient permissions.
-     * @param ex AccessDeniedException
-     * @return Error response with 403 FORBIDDEN
-     */
-    @ExceptionHandler(AccessDeniedException.class)
-    public ResponseEntity<ErrorResponse> handleAccessDeniedException(AccessDeniedException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.FORBIDDEN.value(),
-                "Access denied: You don't have permission to access this resource",
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(error);
-    }
-    
-    /**
-     * Handle HttpMessageNotReadableException - malformed JSON request body.
-     * @param ex HttpMessageNotReadableException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(HttpMessageNotReadableException.class)
-    public ResponseEntity<ErrorResponse> handleHttpMessageNotReadableException(HttpMessageNotReadableException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                "Malformed JSON request: " + ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle MethodArgumentTypeMismatchException - wrong parameter type.
-     * @param ex MethodArgumentTypeMismatchException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
-    public ResponseEntity<ErrorResponse> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException ex) {
-        String message = String.format("Parameter '%s' should be of type %s", 
-                ex.getName(), 
-                ex.getRequiredType() != null ? ex.getRequiredType().getSimpleName() : "unknown");
-        
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                message,
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle MissingServletRequestParameterException - missing required parameter.
-     * @param ex MissingServletRequestParameterException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(MissingServletRequestParameterException.class)
-    public ResponseEntity<ErrorResponse> handleMissingServletRequestParameterException(MissingServletRequestParameterException ex) {
-        String message = String.format("Required parameter '%s' is missing", ex.getParameterName());
-        
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                message,
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-    
-    /**
-     * Handle HttpRequestMethodNotSupportedException - unsupported HTTP method.
-     * @param ex HttpRequestMethodNotSupportedException
-     * @return Error response with 405 METHOD NOT ALLOWED
-     */
-    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
-    public ResponseEntity<ErrorResponse> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException ex) {
-        String message = String.format("Method '%s' is not supported for this endpoint", ex.getMethod());
-        
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.METHOD_NOT_ALLOWED.value(),
-                message,
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.METHOD_NOT_ALLOWED).body(error);
-    }
-    
-    /**
-     * Handle NoHandlerFoundException - endpoint not found.
-     * @param ex NoHandlerFoundException
-     * @return Error response with 404 NOT FOUND
-     */
-    @ExceptionHandler(NoHandlerFoundException.class)
-    public ResponseEntity<ErrorResponse> handleNoHandlerFoundException(NoHandlerFoundException ex) {
-        String message = String.format("Endpoint '%s' not found", ex.getRequestURL());
-        
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.NOT_FOUND.value(),
-                message,
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error);
-    }
-    
-    /**
-     * Handle IllegalArgumentException - invalid arguments to methods.
-     * @param ex IllegalArgumentException
-     * @return Error response with 400 BAD REQUEST
-     */
-    @ExceptionHandler(IllegalArgumentException.class)
-    public ResponseEntity<ErrorResponse> handleIllegalArgumentException(IllegalArgumentException ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.BAD_REQUEST.value(),
-                "Invalid argument: " + ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
-    }
-
-    /**
-     * Handle generic exceptions.
-     * @param ex Exception
-     * @return Error response with 500 INTERNAL SERVER ERROR
-     */
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity<ErrorResponse> handleGenericException(Exception ex) {
-        ErrorResponse error = new ErrorResponse(
-                HttpStatus.INTERNAL_SERVER_ERROR.value(),
-                "An unexpected error occurred: " + ex.getMessage(),
-                LocalDateTime.now()
-        );
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-    }
-
-    /**
-     * Standard error response structure.
-     */
-    public static class ErrorResponse {
-        private int status;
-        private String message;
-        private LocalDateTime timestamp;
-
-        public ErrorResponse(int status, String message, LocalDateTime timestamp) {
-            this.status = status;
-            this.message = message;
-            this.timestamp = timestamp;
-        }
-
-        // Getters
-        public int getStatus() { return status; }
-        public String getMessage() { return message; }
-        public LocalDateTime getTimestamp() { return timestamp; }
-    }
-
-    /**
-     * Validation error response with field-level errors.
-     */
-    public static class ValidationErrorResponse extends ErrorResponse {
-        private Map<String, String> fieldErrors;
-
-        public ValidationErrorResponse(int status, String message, Map<String, String> fieldErrors, LocalDateTime timestamp) {
-            super(status, message, timestamp);
-            this.fieldErrors = fieldErrors;
-        }
-
-        // Getter
-        public Map<String, String> getFieldErrors() { return fieldErrors; }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/InsufficientTrustScoreException.java b/backend/src/main/java/com/locallend/locallend/exception/InsufficientTrustScoreException.java
deleted file mode 100644
index 7514c713a66a3b6256e15b731cf382b265885bb6..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/InsufficientTrustScoreException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a user's trust score is too low to perform an operation.
- * Example: Cannot create booking with trust score below threshold.
- */
-public class InsufficientTrustScoreException extends RuntimeException {
-    private final String userId;
-    private final Double currentScore;
-    private final Double requiredScore;
-
-    public InsufficientTrustScoreException(String userId, Double currentScore, Double requiredScore) {
-        super(String.format("User '%s' has insufficient trust score. Current: %.2f, Required: %.2f", 
-                userId, currentScore, requiredScore));
-        this.userId = userId;
-        this.currentScore = currentScore;
-        this.requiredScore = requiredScore;
-    }
-
-    public String getUserId() { 
-        return userId; 
-    }
-
-    public Double getCurrentScore() { 
-        return currentScore; 
-    }
-
-    public Double getRequiredScore() { 
-        return requiredScore; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/InvalidBookingPeriodException.java b/backend/src/main/java/com/locallend/locallend/exception/InvalidBookingPeriodException.java
deleted file mode 100644
index fc5e3405aefea8f68cb1a31cf09b0967760280f6..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/InvalidBookingPeriodException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a booking period violates rental period constraints.
- */
-public class InvalidBookingPeriodException extends RuntimeException {
-    
-    private Integer minDays;
-    private Integer maxDays;
-    private Long requestedDays;
-
-    public InvalidBookingPeriodException(String message) {
-        super(message);
-    }
-
-    public InvalidBookingPeriodException(String message, Integer minDays, Integer maxDays, Long requestedDays) {
-        super(message);
-        this.minDays = minDays;
-        this.maxDays = maxDays;
-        this.requestedDays = requestedDays;
-    }
-
-    public InvalidBookingPeriodException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public Integer getMinDays() {
-        return minDays;
-    }
-
-    public Integer getMaxDays() {
-        return maxDays;
-    }
-
-    public Long getRequestedDays() {
-        return requestedDays;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/InvalidOperationException.java b/backend/src/main/java/com/locallend/locallend/exception/InvalidOperationException.java
deleted file mode 100644
index ad2eb8540704ce2a4a1969d094304f94f1ce6c49..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/InvalidOperationException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when an operation cannot be performed due to the current state.
- * Examples: Cannot delete active booking, cannot modify completed booking, etc.
- */
-public class InvalidOperationException extends RuntimeException {
-    private final String operation;
-    private final String reason;
-
-    public InvalidOperationException(String operation, String reason) {
-        super(String.format("Cannot perform operation '%s': %s", operation, reason));
-        this.operation = operation;
-        this.reason = reason;
-    }
-
-    public InvalidOperationException(String message) {
-        super(message);
-        this.operation = null;
-        this.reason = null;
-    }
-
-    public String getOperation() { 
-        return operation; 
-    }
-
-    public String getReason() { 
-        return reason; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/InvalidStateTransitionException.java b/backend/src/main/java/com/locallend/locallend/exception/InvalidStateTransitionException.java
deleted file mode 100644
index 23bb08805baf1fbd862ec5ff3948ed913b24f3cf..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/InvalidStateTransitionException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when attempting an invalid state transition.
- * Example: Cannot transition booking from COMPLETED to PENDING.
- */
-public class InvalidStateTransitionException extends RuntimeException {
-    private final String resourceType;
-    private final String currentState;
-    private final String targetState;
-
-    public InvalidStateTransitionException(String resourceType, String currentState, String targetState) {
-        super(String.format("Cannot transition %s from '%s' to '%s'", resourceType, currentState, targetState));
-        this.resourceType = resourceType;
-        this.currentState = currentState;
-        this.targetState = targetState;
-    }
-
-    public InvalidStateTransitionException(String message) {
-        super(message);
-        this.resourceType = null;
-        this.currentState = null;
-        this.targetState = null;
-    }
-
-    public String getResourceType() { 
-        return resourceType; 
-    }
-
-    public String getCurrentState() { 
-        return currentState; 
-    }
-
-    public String getTargetState() { 
-        return targetState; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/ItemNotAvailableException.java b/backend/src/main/java/com/locallend/locallend/exception/ItemNotAvailableException.java
deleted file mode 100644
index 90710f998025f492f382fd4459a0b45131bac75a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/ItemNotAvailableException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when an item is not available for booking.
- * Example: Item status is RENTED, UNAVAILABLE, or under maintenance.
- */
-public class ItemNotAvailableException extends RuntimeException {
-    private final String itemId;
-    private final String currentStatus;
-
-    public ItemNotAvailableException(String itemId, String currentStatus) {
-        super(String.format("Item '%s' is not available for booking. Current status: %s", itemId, currentStatus));
-        this.itemId = itemId;
-        this.currentStatus = currentStatus;
-    }
-
-    public ItemNotAvailableException(String message) {
-        super(message);
-        this.itemId = null;
-        this.currentStatus = null;
-    }
-
-    public String getItemId() { 
-        return itemId; 
-    }
-
-    public String getCurrentStatus() { 
-        return currentStatus; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/ItemNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/ItemNotFoundException.java
deleted file mode 100644
index ea8ec52c01d3c00577b00f92138272936d0afe55..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/ItemNotFoundException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.locallend.locallend.exception;
-
-public class ItemNotFoundException extends RuntimeException {
-    private final String itemId;
-
-    public ItemNotFoundException(String itemId) {
-        super("Item with ID '" + itemId + "' not found");
-        this.itemId = itemId;
-    }
-
-    public String getItemId() { return itemId; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/RatingNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/RatingNotFoundException.java
deleted file mode 100644
index 91d638891f9db8af12e46c290964a5e4dc906134..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/RatingNotFoundException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a rating is not found in the system.
- */
-public class RatingNotFoundException extends RuntimeException {
-    private final String ratingId;
-
-    public RatingNotFoundException(String ratingId) {
-        super("Rating with ID '" + ratingId + "' not found");
-        this.ratingId = ratingId;
-    }
-
-    public RatingNotFoundException(String ratingId, String message) {
-        super(message);
-        this.ratingId = ratingId;
-    }
-
-    public String getRatingId() { 
-        return ratingId; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/ResourceNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/ResourceNotFoundException.java
deleted file mode 100644
index 86845f669cfcb25f11dffd3ef88572871964d9d0..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/ResourceNotFoundException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Generic exception for any resource not found.
- * Can be used as a base class or directly when resource type doesn't need specific handling.
- */
-public class ResourceNotFoundException extends RuntimeException {
-    private final String resourceType;
-    private final String resourceId;
-
-    public ResourceNotFoundException(String resourceType, String resourceId) {
-        super(String.format("%s with ID '%s' not found", resourceType, resourceId));
-        this.resourceType = resourceType;
-        this.resourceId = resourceId;
-    }
-
-    public ResourceNotFoundException(String message) {
-        super(message);
-        this.resourceType = null;
-        this.resourceId = null;
-    }
-
-    public String getResourceType() { 
-        return resourceType; 
-    }
-
-    public String getResourceId() { 
-        return resourceId; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedAccessException.java b/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedAccessException.java
deleted file mode 100644
index 2b4480e4514f516a0883fd72b376db4179820b5c..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedAccessException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Generic exception for unauthorized access to resources.
- * More specific than UnauthorizedItemAccessException for broader use cases.
- */
-public class UnauthorizedAccessException extends RuntimeException {
-    private final String userId;
-    private final String resourceType;
-    private final String resourceId;
-
-    public UnauthorizedAccessException(String userId, String resourceType, String resourceId) {
-        super(String.format("User '%s' is not authorized to access %s '%s'", userId, resourceType, resourceId));
-        this.userId = userId;
-        this.resourceType = resourceType;
-        this.resourceId = resourceId;
-    }
-
-    public UnauthorizedAccessException(String message) {
-        super(message);
-        this.userId = null;
-        this.resourceType = null;
-        this.resourceId = null;
-    }
-
-    public String getUserId() { 
-        return userId; 
-    }
-
-    public String getResourceType() { 
-        return resourceType; 
-    }
-
-    public String getResourceId() { 
-        return resourceId; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedItemAccessException.java b/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedItemAccessException.java
deleted file mode 100644
index 27b7b9d59183bab7ef20f4e07a7f248f1f5c6ab0..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedItemAccessException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.locallend.locallend.exception;
-
-public class UnauthorizedItemAccessException extends RuntimeException {
-    public UnauthorizedItemAccessException(String message) { super(message); }
-    public UnauthorizedItemAccessException() { super("Unauthorized access to item"); }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/UserNotFoundException.java b/backend/src/main/java/com/locallend/locallend/exception/UserNotFoundException.java
deleted file mode 100644
index 82c686e3ad32b6631cb7b581fe3c8a22d81ac560..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/UserNotFoundException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.locallend.locallend.exception;
-
-/**
- * Exception thrown when a user is not found in the system.
- */
-public class UserNotFoundException extends RuntimeException {
-    private final String userId;
-
-    public UserNotFoundException(String userId) {
-        super("User with ID '" + userId + "' not found");
-        this.userId = userId;
-    }
-
-    public UserNotFoundException(String userId, String message) {
-        super(message);
-        this.userId = userId;
-    }
-
-    public String getUserId() { 
-        return userId; 
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/exception/ValidationException.java b/backend/src/main/java/com/locallend/locallend/exception/ValidationException.java
deleted file mode 100644
index 10648941653332743a4c7e03b2869138258d8912..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/exception/ValidationException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.locallend.locallend.exception;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Exception for custom validation errors that don't fit into Bean Validation.
- * Can carry multiple field-level error messages.
- */
-public class ValidationException extends RuntimeException {
-    private final Map<String, String> fieldErrors;
-
-    public ValidationException(String message) {
-        super(message);
-        this.fieldErrors = new HashMap<>();
-    }
-
-    public ValidationException(String message, Map<String, String> fieldErrors) {
-        super(message);
-        this.fieldErrors = fieldErrors != null ? fieldErrors : new HashMap<>();
-    }
-
-    public ValidationException(String field, String error) {
-        super("Validation failed");
-        this.fieldErrors = new HashMap<>();
-        this.fieldErrors.put(field, error);
-    }
-
-    public Map<String, String> getFieldErrors() { 
-        return fieldErrors; 
-    }
-
-    public void addFieldError(String field, String error) {
-        this.fieldErrors.put(field, error);
-    }
-
-    public boolean hasFieldErrors() {
-        return !fieldErrors.isEmpty();
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/Booking.java b/backend/src/main/java/com/locallend/locallend/model/Booking.java
deleted file mode 100644
index aecb502d0370b1638090bd2f1ae16882ba416148..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/Booking.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package com.locallend.locallend.model;
-
-import com.locallend.locallend.model.enums.BookingStatus;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.CompoundIndex;
-import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.mapping.DBRef;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-
-import jakarta.validation.constraints.*;
-import java.time.LocalDateTime;
-import java.util.Objects;
-
-/**
- * Booking entity representing a reservation/borrowing transaction in LocalLend platform.
- * Manages the complete lifecycle from request to completion.
- */
-@Document(collection = "bookings")
-@CompoundIndex(def = "{'borrower_id': 1, 'status': 1}")
-@CompoundIndex(def = "{'owner_id': 1, 'status': 1}")
-@CompoundIndex(def = "{'item_id': 1, 'status': 1}")
-@CompoundIndex(def = "{'status': 1, 'created_date': -1}")
-@CompoundIndex(def = "{'start_date': 1, 'end_date': 1}")
-public class Booking {
-
-    @Id
-    private String id;
-
-    @DBRef
-    @NotNull(message = "Booking must have an item")
-    private Item item;
-
-    @Field("item_id")
-    @Indexed
-    @NotBlank(message = "Item ID is required")
-    private String itemId;
-
-    @DBRef
-    @NotNull(message = "Booking must have a borrower")
-    private User borrower;
-
-    @Field("borrower_id")
-    @Indexed
-    @NotBlank(message = "Borrower ID is required")
-    private String borrowerId;
-
-    @DBRef
-    @NotNull(message = "Booking must have an owner")
-    private User owner;
-
-    @Field("owner_id")
-    @Indexed
-    @NotBlank(message = "Owner ID is required")
-    private String ownerId;
-
-    @Indexed
-    @NotNull(message = "Booking status is required")
-    private BookingStatus status = BookingStatus.PENDING;
-
-    @Field("start_date")
-    @NotNull(message = "Start date is required")
-    @Future(message = "Start date must be in the future")
-    private LocalDateTime startDate;
-
-    @Field("end_date")
-    @NotNull(message = "End date is required")
-    private LocalDateTime endDate;
-
-    @Field("actual_start_date")
-    private LocalDateTime actualStartDate;
-
-    @Field("actual_end_date")
-    private LocalDateTime actualEndDate;
-
-    @Size(max = 500, message = "Booking notes cannot exceed 500 characters")
-    @Field("booking_notes")
-    private String bookingNotes;
-
-    @Size(max = 500, message = "Owner notes cannot exceed 500 characters")
-    @Field("owner_notes")
-    private String ownerNotes;
-
-    @DecimalMin(value = "0.0", message = "Deposit amount cannot be negative")
-    @Field("deposit_amount")
-    private Double depositAmount = 0.0;
-
-    @Field("deposit_paid")
-    private Boolean depositPaid = false;
-
-    @Field("created_date")
-    private LocalDateTime createdDate;
-
-    @Field("updated_date")
-    private LocalDateTime updatedDate;
-
-    @Field("confirmed_date")
-    private LocalDateTime confirmedDate;
-
-    @Field("pickup_date")
-    private LocalDateTime pickupDate;
-
-    @Field("return_date")
-    private LocalDateTime returnDate;
-
-    @Field("cancelled_date")
-    private LocalDateTime cancelledDate;
-
-    @Field("cancellation_reason")
-    @Size(max = 200, message = "Cancellation reason cannot exceed 200 characters")
-    private String cancellationReason;
-
-    @Field("is_rated")
-    private Boolean isRated = false;
-
-    @Min(value = 1, message = "Duration must be at least 1 day")
-    @Max(value = 365, message = "Duration cannot exceed 365 days")
-    @Field("duration_days")
-    private Integer durationDays;
-
-    public Booking() {
-        this.createdDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public Booking(Item item, User borrower, User owner, LocalDateTime startDate, LocalDateTime endDate) {
-        this();
-        this.item = item;
-        this.itemId = item != null ? item.getId() : null;
-        this.borrower = borrower;
-        this.borrowerId = borrower != null ? borrower.getId() : null;
-        this.owner = owner;
-        this.ownerId = owner != null ? owner.getId() : null;
-        this.startDate = startDate;
-        this.endDate = endDate;
-        this.calculateDuration();
-    }
-
-    public void confirm(String ownerNotes) {
-        if (!this.status.canBeConfirmed()) {
-            throw new IllegalStateException("Cannot confirm booking in status: " + this.status);
-        }
-        this.status = BookingStatus.CONFIRMED;
-        this.ownerNotes = ownerNotes;
-        this.confirmedDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public void activate() {
-        if (!this.status.canBeActivated()) {
-            throw new IllegalStateException("Cannot activate booking in status: " + this.status);
-        }
-        this.status = BookingStatus.ACTIVE;
-        this.actualStartDate = LocalDateTime.now();
-        this.pickupDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public void complete() {
-        if (!this.status.canBeCompleted()) {
-            throw new IllegalStateException("Cannot complete booking in status: " + this.status);
-        }
-        this.status = BookingStatus.COMPLETED;
-        this.actualEndDate = LocalDateTime.now();
-        this.returnDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public void cancel(String reason) {
-        if (!this.status.canBeCancelled()) {
-            throw new IllegalStateException("Cannot cancel booking in status: " + this.status);
-        }
-        this.status = BookingStatus.CANCELLED;
-        this.cancellationReason = reason;
-        this.cancelledDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public void reject(String reason) {
-        if (!this.status.canBeConfirmed()) {
-            throw new IllegalStateException("Cannot reject booking in status: " + this.status);
-        }
-        this.status = BookingStatus.REJECTED;
-        this.cancellationReason = reason;
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public void markOverdue() {
-        if (this.status == BookingStatus.ACTIVE) {
-            this.status = BookingStatus.OVERDUE;
-            this.updatedDate = LocalDateTime.now();
-        }
-    }
-
-    public boolean isOverdue() {
-        if (this.status == BookingStatus.ACTIVE && this.endDate != null) {
-            return LocalDateTime.now().isAfter(this.endDate);
-        }
-        return this.status == BookingStatus.OVERDUE;
-    }
-
-    public void calculateDuration() {
-        if (this.startDate != null && this.endDate != null) {
-            this.durationDays = (int) java.time.Duration.between(
-                    this.startDate.toLocalDate().atStartOfDay(),
-                    this.endDate.toLocalDate().atStartOfDay()
-            ).toDays() + 1;
-        }
-    }
-
-    public boolean requiresDeposit() {
-        return this.depositAmount != null && this.depositAmount > 0;
-    }
-
-    public long getDaysUntilStart() {
-        if (this.startDate != null) {
-            return java.time.Duration.between(LocalDateTime.now(), this.startDate).toDays();
-        }
-        return 0;
-    }
-
-    public long getDaysUntilEnd() {
-        if (this.endDate != null) {
-            return java.time.Duration.between(LocalDateTime.now(), this.endDate).toDays();
-        }
-        return 0;
-    }
-
-    public void updateDates(LocalDateTime newStartDate, LocalDateTime newEndDate) {
-        if (newStartDate.isAfter(newEndDate)) {
-            throw new IllegalArgumentException("Start date cannot be after end date");
-        }
-        this.startDate = newStartDate;
-        this.endDate = newEndDate;
-        this.calculateDuration();
-        this.updatedDate = LocalDateTime.now();
-    }
-
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public Item getItem() { return item; }
-    public void setItem(Item item) {
-        this.item = item;
-        this.itemId = item != null ? item.getId() : null;
-    }
-
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-
-    public User getBorrower() { return borrower; }
-    public void setBorrower(User borrower) {
-        this.borrower = borrower;
-        this.borrowerId = borrower != null ? borrower.getId() : null;
-    }
-
-    public String getBorrowerId() { return borrowerId; }
-    public void setBorrowerId(String borrowerId) { this.borrowerId = borrowerId; }
-
-    public User getOwner() { return owner; }
-    public void setOwner(User owner) {
-        this.owner = owner;
-        this.ownerId = owner != null ? owner.getId() : null;
-    }
-
-    public String getOwnerId() { return ownerId; }
-    public void setOwnerId(String ownerId) { this.ownerId = ownerId; }
-
-    public BookingStatus getStatus() { return status; }
-    public void setStatus(BookingStatus status) { this.status = status; }
-
-    public LocalDateTime getStartDate() { return startDate; }
-    public void setStartDate(LocalDateTime startDate) { this.startDate = startDate; }
-
-    public LocalDateTime getEndDate() { return endDate; }
-    public void setEndDate(LocalDateTime endDate) { this.endDate = endDate; }
-
-    public LocalDateTime getActualStartDate() { return actualStartDate; }
-    public void setActualStartDate(LocalDateTime actualStartDate) { this.actualStartDate = actualStartDate; }
-
-    public LocalDateTime getActualEndDate() { return actualEndDate; }
-    public void setActualEndDate(LocalDateTime actualEndDate) { this.actualEndDate = actualEndDate; }
-
-    public String getBookingNotes() { return bookingNotes; }
-    public void setBookingNotes(String bookingNotes) { this.bookingNotes = bookingNotes; }
-
-    public String getOwnerNotes() { return ownerNotes; }
-    public void setOwnerNotes(String ownerNotes) { this.ownerNotes = ownerNotes; }
-
-    public Double getDepositAmount() { return depositAmount; }
-    public void setDepositAmount(Double depositAmount) { this.depositAmount = depositAmount; }
-
-    public Boolean getDepositPaid() { return depositPaid; }
-    public void setDepositPaid(Boolean depositPaid) { this.depositPaid = depositPaid; }
-
-    public LocalDateTime getCreatedDate() { return createdDate; }
-    public void setCreatedDate(LocalDateTime createdDate) { this.createdDate = createdDate; }
-
-    public LocalDateTime getUpdatedDate() { return updatedDate; }
-    public void setUpdatedDate(LocalDateTime updatedDate) { this.updatedDate = updatedDate; }
-
-    public LocalDateTime getConfirmedDate() { return confirmedDate; }
-    public void setConfirmedDate(LocalDateTime confirmedDate) { this.confirmedDate = confirmedDate; }
-
-    public LocalDateTime getPickupDate() { return pickupDate; }
-    public void setPickupDate(LocalDateTime pickupDate) { this.pickupDate = pickupDate; }
-
-    public LocalDateTime getReturnDate() { return returnDate; }
-    public void setReturnDate(LocalDateTime returnDate) { this.returnDate = returnDate; }
-
-    public LocalDateTime getCancelledDate() { return cancelledDate; }
-    public void setCancelledDate(LocalDateTime cancelledDate) { this.cancelledDate = cancelledDate; }
-
-    public String getCancellationReason() { return cancellationReason; }
-    public void setCancellationReason(String cancellationReason) { this.cancellationReason = cancellationReason; }
-
-    public Boolean getIsRated() { return isRated; }
-    public void setIsRated(Boolean isRated) { this.isRated = isRated; }
-
-    public Integer getDurationDays() { return durationDays; }
-    public void setDurationDays(Integer durationDays) { this.durationDays = durationDays; }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Booking booking = (Booking) o;
-        return Objects.equals(id, booking.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString() {
-        return "Booking{" +
-                "id='" + id + '\'' +
-                ", itemId='" + itemId + '\'' +
-                ", borrowerId='" + borrowerId + '\'' +
-                ", ownerId='" + ownerId + '\'' +
-                ", status=" + status +
-                ", startDate=" + startDate +
-                ", endDate=" + endDate +
-                ", durationDays=" + durationDays +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/Category.java b/backend/src/main/java/com/locallend/locallend/model/Category.java
deleted file mode 100644
index f2a20dc7e1607ca50608461a50d904416385dabd..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/Category.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.locallend.locallend.model;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.index.TextIndexed;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import java.time.LocalDateTime;
-
-/**
- * Represents a category for organizing tools and items in the LocalLend platform.
- * Categories help users classify and find items efficiently.
- * Supports hierarchical structure with parent-child relationships.
- */
-@Document(collection = "categories")
-public class Category {
-    @Id
-    private String id;
-
-    @NotBlank(message = "Category name is required")
-    @Size(min = 2, max = 50, message = "Category name must be between 2 and 50 characters")
-    @Indexed(unique = true)
-    @TextIndexed
-    @Field("name")
-    private String name;
-
-    @Size(max = 200, message = "Description cannot exceed 200 characters")
-    @TextIndexed
-    @Field("description")
-    private String description;
-
-    @Field("parent_category_id")
-    private String parentCategoryId;
-
-    @Field("is_active")
-    private boolean isActive = true;
-
-    @Field("item_count")
-    private long itemCount = 0;
-
-    @CreatedDate
-    @Field("created_at")
-    private LocalDateTime createdAt;
-
-    @LastModifiedDate
-    @Field("updated_at")
-    private LocalDateTime updatedAt;
-
-    public Category() {}
-
-    public Category(String name, String description) {
-        this.name = name;
-        this.description = description;
-        this.isActive = true;
-        this.itemCount = 0;
-    }
-
-    public Category(String name, String description, String parentCategoryId) {
-        this.name = name;
-        this.description = description;
-        this.parentCategoryId = parentCategoryId;
-        this.isActive = true;
-        this.itemCount = 0;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getParentCategoryId() {
-        return parentCategoryId;
-    }
-
-    public void setParentCategoryId(String parentCategoryId) {
-        this.parentCategoryId = parentCategoryId;
-    }
-
-    public boolean isActive() {
-        return isActive;
-    }
-
-    public void setActive(boolean active) {
-        isActive = active;
-    }
-
-    public long getItemCount() {
-        return itemCount;
-    }
-
-    public void setItemCount(long itemCount) {
-        this.itemCount = itemCount;
-    }
-
-    public LocalDateTime getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(LocalDateTime createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public LocalDateTime getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(LocalDateTime updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public void incrementItemCount() {
-        this.itemCount++;
-    }
-
-    public void decrementItemCount() {
-        if (this.itemCount > 0) {
-            this.itemCount--;
-        }
-    }
-
-    public boolean hasParent() {
-        return parentCategoryId != null && !parentCategoryId.isEmpty();
-    }
-
-    @Override
-    public String toString() {
-        return "Category{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", description='" + description + '\'' +
-                ", parentCategoryId='" + parentCategoryId + '\'' +
-                ", isActive=" + isActive +
-                ", itemCount=" + itemCount +
-                ", createdAt=" + createdAt +
-                ", updatedAt=" + updatedAt +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/Item.java b/backend/src/main/java/com/locallend/locallend/model/Item.java
deleted file mode 100644
index 0562e5796d813cfeb6dd331158edad227282acb3..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/Item.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.locallend.locallend.model;
-
-import com.locallend.locallend.model.enums.ItemCondition;
-import com.locallend.locallend.model.enums.ItemStatus;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.mongodb.core.mapping.DBRef;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.core.index.TextIndexed;
-import org.springframework.data.mongodb.core.index.Indexed;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Document(collection = "items")
-public class Item {
-    @Id
-    private String id;
-
-    @Field("name")
-    @TextIndexed
-    private String name;
-
-    @Field("description")
-    @TextIndexed
-    private String description;
-
-    @Field("condition")
-    private ItemCondition condition = ItemCondition.GOOD;
-
-    @Field("status")
-    @Indexed
-    private ItemStatus status = ItemStatus.AVAILABLE;
-
-    @Field("deposit")
-    private double deposit = 0.0;
-
-    @Field("images")
-    private List<String> images = new ArrayList<>();
-
-    @Field("ratings")
-    private List<Integer> ratings = new ArrayList<>();
-
-    @DBRef(lazy = true)
-    @Field("owner")
-    private User owner;
-
-    @DBRef(lazy = true)
-    @Field("category")
-    private Category category;
-
-    @Field("is_active")
-    private boolean isActive = true;
-
-    @CreatedDate
-    @Field("created_at")
-    private LocalDateTime createdAt;
-
-    @LastModifiedDate
-    @Field("updated_at")
-    private LocalDateTime updatedAt;
-
-    public Item() {}
-
-    public Item(String name, String description, ItemCondition condition, double deposit) {
-        this.name = name;
-        this.description = description;
-        this.condition = condition;
-        this.deposit = deposit;
-        this.status = ItemStatus.AVAILABLE;
-    }
-
-    // Getters and setters
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-
-    public String getName() { return name; }
-    public void setName(String name) { this.name = name; }
-
-    public String getDescription() { return description; }
-    public void setDescription(String description) { this.description = description; }
-
-    public ItemCondition getCondition() { return condition; }
-    public void setCondition(ItemCondition condition) { this.condition = condition; }
-
-    public ItemStatus getStatus() { return status; }
-    public void setStatus(ItemStatus status) { this.status = status; }
-
-    public double getDeposit() { return deposit; }
-    public void setDeposit(double deposit) { this.deposit = deposit; }
-
-    public List<String> getImages() { return images; }
-    public void setImages(List<String> images) { this.images = images; }
-
-    public List<Integer> getRatings() { return ratings; }
-    public void setRatings(List<Integer> ratings) { this.ratings = ratings; }
-
-    public User getOwner() { return owner; }
-    public void setOwner(User owner) { this.owner = owner; }
-
-    public Category getCategory() { return category; }
-    public void setCategory(Category category) { this.category = category; }
-
-    public boolean isActive() { return isActive; }
-    public void setActive(boolean active) { isActive = active; }
-
-    public LocalDateTime getCreatedAt() { return createdAt; }
-    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
-
-    public LocalDateTime getUpdatedAt() { return updatedAt; }
-    public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
-
-    // Business methods
-    public boolean canBeBorrowed() {
-        return isActive && status == ItemStatus.AVAILABLE;
-    }
-
-    public void markAsBorrowed() {
-        if (canBeBorrowed()) {
-            this.status = ItemStatus.BORROWED;
-        } else {
-            throw new IllegalStateException("Item cannot be borrowed in its current state");
-        }
-    }
-
-    public void updateRating(int rating) {
-        if (rating < 1 || rating > 5) throw new IllegalArgumentException("Rating must be 1-5");
-        this.ratings.add(rating);
-    }
-
-    public double getAverageRating() {
-        if (ratings == null || ratings.isEmpty()) return 0.0;
-        return ratings.stream().mapToInt(Integer::intValue).average().orElse(0.0);
-    }
-
-    @Override
-    public String toString() {
-        return "Item{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", status=" + status +
-                ", condition=" + condition +
-                '}';
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/Rating.java b/backend/src/main/java/com/locallend/locallend/model/Rating.java
deleted file mode 100644
index 9a951aab16de175f5fa0a7f1734f63071f2d739d..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/Rating.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.locallend.locallend.model;
-
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.index.CompoundIndex;
-import org.springframework.data.mongodb.core.index.CompoundIndexes;
-import jakarta.validation.constraints.*;
-import java.time.LocalDateTime;
-
-/**
- * Rating entity for LocalLend system.
- * Supports bidirectional ratings (user-to-user and user-to-item) with booking integration.
- * Issue #23: Rating Entity, Repository, DTO
- */
-@Document(collection = "ratings")
-@CompoundIndexes({
-    @CompoundIndex(name = "rater_ratee_idx", def = "{'raterId': 1, 'rateeId': 1, 'ratingType': 1}"),
-    @CompoundIndex(name = "booking_idx", def = "{'bookingId': 1}"),
-    @CompoundIndex(name = "item_rating_idx", def = "{'itemId': 1, 'ratingValue': -1}")
-})
-public class Rating {
-    
-    @Id
-    private String id;
-    
-    @Indexed
-    @NotBlank(message = "Rater ID is required")
-    @Field("rater_id")
-    private String raterId;
-    
-    @Indexed
-    @NotBlank(message = "Ratee ID is required")
-    @Field("ratee_id")
-    private String rateeId;
-    
-    @Field("item_id")
-    private String itemId;
-    
-    @Field("booking_id")
-    private String bookingId;
-    
-    @NotNull(message = "Rating type is required")
-    @Field("rating_type")
-    private RatingType ratingType;
-    
-    @NotNull(message = "Rating value is required")
-    @Min(value = 1, message = "Rating must be between 1 and 5")
-    @Max(value = 5, message = "Rating must be between 1 and 5")
-    @Field("rating_value")
-    private Integer ratingValue;
-    
-    @Size(max = 1000, message = "Comment cannot exceed 1000 characters")
-    private String comment;
-    
-    @Field("created_date")
-    private LocalDateTime createdDate;
-    
-    @Field("updated_date")
-    private LocalDateTime updatedDate;
-    
-    @Field("is_anonymous")
-    private Boolean isAnonymous = false;
-    
-    @Field("helpful_count")
-    private Integer helpfulCount = 0;
-    
-    @Field("is_verified")
-    private Boolean isVerified = false;
-    
-    // Constructors
-    public Rating() {
-        this.createdDate = LocalDateTime.now();
-        this.updatedDate = LocalDateTime.now();
-    }
-    
-    public Rating(String raterId, String rateeId, RatingType ratingType, Integer ratingValue) {
-        this();
-        this.raterId = raterId;
-        this.rateeId = rateeId;
-        this.ratingType = ratingType;
-        this.ratingValue = ratingValue;
-    }
-    
-    // Business Logic Methods
-    
-    /**
-     * Check if this rating affects user trust score.
-     * @return true if rating should be included in trust score calculation
-     */
-    public boolean isUserRating() {
-        return ratingType.affectsTrustScore();
-    }
-    
-    /**
-     * Check if this rating affects item quality score.
-     * @return true if rating should be included in item quality calculation
-     */
-    public boolean isItemRating() {
-        return ratingType.affectsItemQuality();
-    }
-    
-    // Getters and Setters
-    
-    public String getId() { return id; }
-    public void setId(String id) { this.id = id; }
-    
-    public String getRaterId() { return raterId; }
-    public void setRaterId(String raterId) { this.raterId = raterId; }
-    
-    public String getRateeId() { return rateeId; }
-    public void setRateeId(String rateeId) { this.rateeId = rateeId; }
-    
-    public String getItemId() { return itemId; }
-    public void setItemId(String itemId) { this.itemId = itemId; }
-    
-    public String getBookingId() { return bookingId; }
-    public void setBookingId(String bookingId) { 
-        this.bookingId = bookingId;
-        // Automatically verify rating if linked to booking
-        this.isVerified = (bookingId != null);
-    }
-    
-    public RatingType getRatingType() { return ratingType; }
-    public void setRatingType(RatingType ratingType) { this.ratingType = ratingType; }
-    
-    public Integer getRatingValue() { return ratingValue; }
-    public void setRatingValue(Integer ratingValue) { 
-        this.ratingValue = ratingValue;
-        this.updatedDate = LocalDateTime.now();
-    }
-    
-    public String getComment() { return comment; }
-    public void setComment(String comment) { 
-        this.comment = comment;
-        this.updatedDate = LocalDateTime.now();
-    }
-    
-    public LocalDateTime getCreatedDate() { return createdDate; }
-    public void setCreatedDate(LocalDateTime createdDate) { this.createdDate = createdDate; }
-    
-    public LocalDateTime getUpdatedDate() { return updatedDate; }
-    public void setUpdatedDate(LocalDateTime updatedDate) { this.updatedDate = updatedDate; }
-    
-    public Boolean getIsAnonymous() { return isAnonymous; }
-    public void setIsAnonymous(Boolean isAnonymous) { this.isAnonymous = isAnonymous; }
-    
-    public Integer getHelpfulCount() { return helpfulCount; }
-    public void setHelpfulCount(Integer helpfulCount) { this.helpfulCount = helpfulCount; }
-    
-    public Boolean getIsVerified() { return isVerified; }
-    public void setIsVerified(Boolean isVerified) { this.isVerified = isVerified; }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/RatingType.java b/backend/src/main/java/com/locallend/locallend/model/RatingType.java
deleted file mode 100644
index 3795ad32458b877b808e3f2767d089f5fd40e44f..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/RatingType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.locallend.locallend.model;
-
-/**
- * Enum defining different types of ratings in the LocalLend system.
- * Supports bidirectional ratings for users and items.
- */
-public enum RatingType {
-    USER_TO_USER("User to User", "Rating between users"),
-    USER_TO_ITEM("User to Item", "Rating of item quality"),
-    OWNER_TO_BORROWER("Owner to Borrower", "Owner rating borrower"),
-    BORROWER_TO_OWNER("Borrower to Owner", "Borrower rating owner");
-    
-    private final String displayName;
-    private final String description;
-    
-    RatingType(String displayName, String description) {
-        this.displayName = displayName;
-        this.description = description;
-    }
-    
-    public String getDisplayName() { return displayName; }
-    public String getDescription() { return description; }
-    
-    /**
-     * Check if this rating type affects user trust score.
-     * @return true if rating impacts trust score calculation
-     */
-    public boolean affectsTrustScore() {
-        return this == USER_TO_USER || this == OWNER_TO_BORROWER || this == BORROWER_TO_OWNER;
-    }
-    
-    /**
-     * Check if this rating type affects item quality score.
-     * @return true if rating impacts item quality calculation
-     */
-    public boolean affectsItemQuality() {
-        return this == USER_TO_ITEM;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/User.java b/backend/src/main/java/com/locallend/locallend/model/User.java
deleted file mode 100644
index 8be8a00f8161ccfdef2432554855377b3c440535..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/User.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.locallend.locallend.model;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.CompoundIndex;
-import org.springframework.data.mongodb.core.index.CompoundIndexes;
-import org.springframework.data.mongodb.core.index.GeoSpatialIndexed;
-import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
-import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.geo.Point;
-
-import jakarta.validation.constraints.*;
-import java.time.LocalDateTime;
-
-/** 
- * Represents a user in the LocalLend platform.
- * Production-ready entity with validation, indexing, and geospatial support.
- */
-@Document(collection = "users")
-@CompoundIndexes({
-	@CompoundIndex(name = "username_unique_idx", def = "{'username': 1}", unique = true),
-	@CompoundIndex(name = "email_unique_idx", def = "{'email': 1}", unique = true)
-})
-public class User{
-	@Id
-	private String id;
-	
-	@Indexed(unique = true)
-	@NotBlank(message = "Username is required")
-	@Size(min = 3, max = 20, message = "Username must be between 3 and 20 characters")
-	private String username;
-	
-	@NotBlank(message = "Name is required")
-	@Size(max = 100, message = "Name cannot exceed 100 characters")
-	private String name;
-	
-	@Indexed(unique = true)
-	@Email(message = "Invalid email format")
-	@NotBlank(message = "Email is required")
-	private String email;
-	
-	@NotBlank(message = "Password is required")
-	@Size(min = 8, max = 100, message = "Password must be between 8 and 100 characters")
-	private String password;
-	
-	@Field("phone_number")
-	@Pattern(regexp = "^\\+?[1-9]\\d{1,14}$", message = "Invalid phone number format")
-	private String phoneNumber;
-	
-	@Field("profile_image_url")
-	private String profileImageUrl;
-	
-	@Pattern(regexp = "^(USER|ADMIN)$", message = "Role must be USER or ADMIN")
-	private String role = "USER";
-	
-	@Field("is_active")
-	private Boolean isActive = true;
-	
-	@Field("created_date")
-	private LocalDateTime createdDate;
-    
-	// Trust/reputation score for the user (0.0 - 5.0)
-	@Field("trust_score")
-	@DecimalMin(value = "0.0", message = "Trust score cannot be negative")
-	@DecimalMax(value = "5.0", message = "Trust score cannot exceed 5.0")
-	private Double trustScore = 5.0;
-
-	// Denormalized count of items owned by the user
-	@Field("item_count")
-	private Long itemCount = 0L;
-	
-	// Geospatial location for proximity-based features
-	@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE)
-	private Point location;
-	
-	// Rating-related fields (Issue #25)
-	@Field("total_ratings_received")
-	private Integer totalRatingsReceived = 0;
-
-	@Field("last_trust_score_update")
-	private LocalDateTime lastTrustScoreUpdate;
-
-	@Field("rating_count_as_borrower")
-	private Integer ratingCountAsBorrower = 0;
-
-	@Field("rating_count_as_lender")
-	private Integer ratingCountAsLender = 0;
-
-	@Field("average_rating_as_borrower")
-	private Double averageRatingAsBorrower = 5.0;
-
-	@Field("average_rating_as_lender")
-	private Double averageRatingAsLender = 5.0;
-	
-	public User(){
-		this.createdDate = LocalDateTime.now();
-	}
-
-	// Constructor for Issue #4 registration
-	public User(String username, String name, String email, String password){
-		this();
-		this.username = username;
-		this.name = name;
-		this.email = email;
-		this.password = password;
-	}
-
-	// Legacy constructor
-	public User(String name, String email){
-		this();
-		this.name = name;
-		this.email = email;
-	}
-    
-	public User(String name, String email, Double trustScore, Long itemCount) {
-		this();
-		this.name = name;
-		this.email = email;
-		this.trustScore = trustScore;
-		this.itemCount = itemCount;
-	}
-
-	//Getters and Setters
-
-	public String getId(){return id;}
-	public void setId(String id){this.id=id;}
-	
-	public String getUsername(){return username;}
-	public void setUsername(String username){this.username=username;}
-	
-	public String getName(){return name;}
-	public void setName(String name){this.name=name;}
-	
-	public String getEmail(){return email;}
-	public void setEmail(String email){this.email=email;}
-	
-	public String getPassword(){return password;}
-	public void setPassword(String password){this.password=password;}
-	
-	public String getPhoneNumber(){return phoneNumber;}
-	public void setPhoneNumber(String phoneNumber){this.phoneNumber=phoneNumber;}
-	
-	public String getProfileImageUrl(){return profileImageUrl;}
-	public void setProfileImageUrl(String profileImageUrl){this.profileImageUrl=profileImageUrl;}
-	
-	public String getRole(){return role;}
-	public void setRole(String role){this.role=role;}
-	
-	public Boolean getIsActive(){return isActive;}
-	public void setIsActive(Boolean isActive){this.isActive=isActive;}
-	
-	public LocalDateTime getCreatedDate(){return createdDate;}
-	public void setCreatedDate(LocalDateTime createdDate){this.createdDate=createdDate;}
-
-	public Double getTrustScore() { return trustScore; }
-	public void setTrustScore(Double trustScore) { this.trustScore = trustScore; }
-
-	public Long getItemCount() { return itemCount; }
-	public void setItemCount(Long itemCount) { this.itemCount = itemCount; }
-	
-	public Point getLocation() { return location; }
-	public void setLocation(Point location) { this.location = location; }
-	
-	// Rating-related getters and setters (Issue #25)
-	public Integer getTotalRatingsReceived() { return totalRatingsReceived; }
-	public void setTotalRatingsReceived(Integer totalRatingsReceived) { this.totalRatingsReceived = totalRatingsReceived; }
-
-	public LocalDateTime getLastTrustScoreUpdate() { return lastTrustScoreUpdate; }
-	public void setLastTrustScoreUpdate(LocalDateTime lastTrustScoreUpdate) { this.lastTrustScoreUpdate = lastTrustScoreUpdate; }
-
-	public Integer getRatingCountAsBorrower() { return ratingCountAsBorrower; }
-	public void setRatingCountAsBorrower(Integer ratingCountAsBorrower) { this.ratingCountAsBorrower = ratingCountAsBorrower; }
-
-	public Integer getRatingCountAsLender() { return ratingCountAsLender; }
-	public void setRatingCountAsLender(Integer ratingCountAsLender) { this.ratingCountAsLender = ratingCountAsLender; }
-
-	public Double getAverageRatingAsBorrower() { return averageRatingAsBorrower; }
-	public void setAverageRatingAsBorrower(Double averageRatingAsBorrower) { this.averageRatingAsBorrower = averageRatingAsBorrower; }
-
-	public Double getAverageRatingAsLender() { return averageRatingAsLender; }
-	public void setAverageRatingAsLender(Double averageRatingAsLender) { this.averageRatingAsLender = averageRatingAsLender; }
-
-	// Rating-related helper methods (Issue #25)
-	public void incrementRatingsReceived() {
-		this.totalRatingsReceived++;
-	}
-
-	public boolean hasRatings() {
-		return totalRatingsReceived != null && totalRatingsReceived > 0;
-	}
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/enums/BookingStatus.java b/backend/src/main/java/com/locallend/locallend/model/enums/BookingStatus.java
deleted file mode 100644
index 7a47d44a9245d6f246b8d4e20d8a917713cbe38f..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/enums/BookingStatus.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.locallend.locallend.model.enums;
-
-/**
- * Enumeration representing the lifecycle status of a booking in LocalLend platform.
- * Tracks the progression from initial request to completion or cancellation.
- */
-public enum BookingStatus {
-    PENDING("Pending - Waiting for owner approval"),
-    CONFIRMED("Confirmed - Approved by owner, awaiting pickup"),
-    ACTIVE("Active - Item currently borrowed"),
-    COMPLETED("Completed - Item returned successfully"),
-    CANCELLED("Cancelled - Booking cancelled by borrower"),
-    REJECTED("Rejected - Declined by owner"),
-    OVERDUE("Overdue - Return date passed");
-
-    private final String description;
-
-    BookingStatus(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public boolean canBeCancelled() {
-        return this == PENDING || this == CONFIRMED;
-    }
-
-    public boolean canBeConfirmed() {
-        return this == PENDING;
-    }
-
-    public boolean canBeActivated() {
-        return this == CONFIRMED;
-    }
-
-    public boolean canBeCompleted() {
-        return this == ACTIVE || this == OVERDUE;
-    }
-
-    public boolean isFinalStatus() {
-        return this == COMPLETED || this == CANCELLED || this == REJECTED;
-    }
-
-    public boolean isActive() {
-        return this == ACTIVE || this == OVERDUE;
-    }
-
-    /**
-     * Check if this status can transition to another status.
-     */
-    public boolean canTransitionTo(BookingStatus newStatus) {
-        if (newStatus == null) return false;
-        
-        return switch (this) {
-            case PENDING -> newStatus == CONFIRMED || newStatus == CANCELLED || newStatus == REJECTED;
-            case CONFIRMED -> newStatus == ACTIVE || newStatus == CANCELLED;
-            case ACTIVE -> newStatus == COMPLETED || newStatus == OVERDUE;
-            case COMPLETED, CANCELLED, REJECTED, OVERDUE -> false;
-        };
-    }
-
-    public static BookingStatus fromString(String value) {
-        if (value == null || value.trim().isEmpty()) {
-            throw new IllegalArgumentException("Booking status cannot be null or empty");
-        }
-
-        try {
-            return BookingStatus.valueOf(value.toUpperCase().trim());
-        } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("Invalid booking status: " + value +
-                    ". Valid values are: PENDING, CONFIRMED, ACTIVE, COMPLETED, CANCELLED, REJECTED, OVERDUE");
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/enums/ItemCondition.java b/backend/src/main/java/com/locallend/locallend/model/enums/ItemCondition.java
deleted file mode 100644
index 0bf3dbb2f2b25a1728ecae0fe0cea480f4c37a19..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/enums/ItemCondition.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.locallend.locallend.model.enums;
-
-public enum ItemCondition {
-    NEW("Brand new"),
-    EXCELLENT("Excellent condition"),
-    GOOD("Good condition"),
-    FAIR("Fair condition"),
-    POOR("Poor condition");
-
-    private final String description;
-
-    ItemCondition(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() { return description; }
-
-    public static ItemCondition fromString(String s) {
-        if (s == null) return null;
-        try {
-            return ItemCondition.valueOf(s.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/model/enums/ItemStatus.java b/backend/src/main/java/com/locallend/locallend/model/enums/ItemStatus.java
deleted file mode 100644
index ddb3b7bec491b5b76b5128c53a5eea723e82b0dc..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/model/enums/ItemStatus.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.locallend.locallend.model.enums;
-
-public enum ItemStatus {
-    AVAILABLE,
-    BOOKED,
-    BORROWED,
-    MAINTENANCE,
-    UNAVAILABLE;
-
-    public static ItemStatus fromString(String s) {
-        if (s == null) return null;
-        try {
-            return ItemStatus.valueOf(s.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/repository/BookingRepository.java b/backend/src/main/java/com/locallend/locallend/repository/BookingRepository.java
deleted file mode 100644
index c0a7b82520baa421f0e2436a90919556fffb0f8e..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/repository/BookingRepository.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.locallend.locallend.repository;
-
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.model.enums.BookingStatus;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * Repository interface for Booking entity providing CRUD operations and key queries.
- * (Slimmed initial version of full spec; can be extended later.)
- */
-public interface BookingRepository extends MongoRepository<Booking, String> {
-
-    List<Booking> findByBorrowerId(String borrowerId);
-    List<Booking> findByOwnerId(String ownerId);
-    Page<Booking> findByBorrowerId(String borrowerId, Pageable pageable);
-    Page<Booking> findByOwnerId(String ownerId, Pageable pageable);
-
-    List<Booking> findByItemId(String itemId);
-    List<Booking> findByItemIdAndStatus(String itemId, BookingStatus status);
-
-    List<Booking> findByStatus(BookingStatus status);
-    Page<Booking> findByStatus(BookingStatus status, Pageable pageable);
-
-    List<Booking> findByBorrowerIdAndStatus(String borrowerId, BookingStatus status);
-    List<Booking> findByOwnerIdAndStatus(String ownerId, BookingStatus status);
-
-    @Query("{'status': {'$in': ['CONFIRMED', 'ACTIVE']}}")
-    List<Booking> findActiveBookings();
-
-    @Query("{'status': 'ACTIVE', 'end_date': {'$lt': ?0}}")
-    List<Booking> findOverdueBookings(LocalDateTime now);
-
-    @Query("{'item_id': ?0, 'status': {'$in': ['CONFIRMED', 'ACTIVE']}, '$or': [" +
-            "{'start_date': {'$lte': ?2}, 'end_date': {'$gte': ?1}}, " +
-            "{'start_date': {'$lte': ?1}, 'end_date': {'$gte': ?1}}, " +
-            "{'start_date': {'$lte': ?2}, 'end_date': {'$gte': ?2}}]}")
-    List<Booking> findConflictingBookings(String itemId, LocalDateTime requestedStart, LocalDateTime requestedEnd);
-
-    // Statistics queries
-    long countByItemIdAndStatus(String itemId, BookingStatus status);
-
-    @Query("{'borrower_id': ?0, 'status': 'COMPLETED', 'end_date': {'$gte': ?1, '$lte': ?2}}")
-    long countCompletedBookingsByBorrowerInPeriod(String borrowerId, LocalDateTime start, LocalDateTime end);
-
-    @Query("{'owner_id': ?0, 'status': 'COMPLETED', 'end_date': {'$gte': ?1, '$lte': ?2}}")
-    long countCompletedBookingsByOwnerInPeriod(String ownerId, LocalDateTime start, LocalDateTime end);
-
-    // User-based queries with status
-    List<Booking> findByBorrowerIdAndStatusOrderByCreatedDateDesc(String borrowerId, BookingStatus status);
-    List<Booking> findByOwnerIdAndStatusOrderByCreatedDateDesc(String ownerId, BookingStatus status);
-}
diff --git a/backend/src/main/java/com/locallend/locallend/repository/CategoryRepository.java b/backend/src/main/java/com/locallend/locallend/repository/CategoryRepository.java
deleted file mode 100644
index cdf2215979fc3a0f119883afd25c8610f70928a8..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/repository/CategoryRepository.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.locallend.locallend.repository;
-
-import com.locallend.locallend.model.Category;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface CategoryRepository extends MongoRepository<Category, String> {
-
-    @Query("{ 'name': { $regex: ?0, $options: 'i' } }")
-    Optional<Category> findByNameIgnoreCase(String name);
-
-    @Query("{ 'is_active': true }")
-    List<Category> findAllActiveCategories(Sort sort);
-
-    @Query("{ 'parent_category_id': ?0, 'is_active': true }")
-    List<Category> findByParentCategoryId(String parentCategoryId, Sort sort);
-
-    @Query("{ 'parent_category_id': { $exists: false }, 'is_active': true }")
-    List<Category> findRootCategories(Sort sort);
-
-    @Query("{ $text: { $search: ?0 }, 'is_active': true }")
-    List<Category> searchCategoriesByText(String searchTerm, Sort sort);
-
-    @Query("{ 'item_count': { $gt: ?0 }, 'is_active': true }")
-    List<Category> findCategoriesWithMinimumItems(long minItemCount, Sort sort);
-
-    @Query(value = "{ 'name': { $regex: ?0, $options: 'i' }, 'is_active': true }", exists = true)
-    boolean existsByNameIgnoreCase(String name);
-
-    @Query(value = "{ 'is_active': true }", count = true)
-    long countActiveCategories();
-
-    @Query("{ 'is_active': true }")
-    List<Category> findAllActiveCategoriesOrderByItemCountDesc();
-
-    List<Category> findByIsActiveTrueOrderByNameAsc();
-
-    List<Category> findByIsActiveTrueOrderByCreatedAtDesc();
-
-    List<Category> findByIsActiveTrueOrderByItemCountDesc();
-}
diff --git a/backend/src/main/java/com/locallend/locallend/repository/ItemRepository.java b/backend/src/main/java/com/locallend/locallend/repository/ItemRepository.java
deleted file mode 100644
index 1590d54b3b5a3a9322e83f233b8fd2e73421724c..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/repository/ItemRepository.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.locallend.locallend.repository;
-
-import com.locallend.locallend.model.Category;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface ItemRepository extends MongoRepository<Item, String> {
-
-    // Owner-based queries
-    Page<Item> findByOwner(User owner, Pageable pageable);
-    Page<Item> findByOwnerAndIsActiveTrue(User owner, Pageable pageable);
-    List<Item> findByOwnerAndIsActiveTrueAndStatus(User owner, String status, Sort sort);
-
-    @Query("{ 'owner.$id': ?0 }")
-    List<Item> findByOwnerId(String ownerId, Sort sort);
-
-    // Availability queries
-    Page<Item> findByIsActiveTrueAndStatus(String status, Pageable pageable);
-
-    Page<Item> findByIsActiveTrueAndCategory(Category category, Pageable pageable);
-
-    // Search across title/description/tags with paging
-    @Query("{ $and: [ {'is_active': true}, { $or: [ {'name': { $regex: ?0, $options: 'i' }}, {'description': { $regex: ?0, $options: 'i' }}, {'images': { $in: [{ $regex: ?0, $options: 'i' }] } } ] } ] }")
-    Page<Item> searchAvailableItems(String searchTerm, Pageable pageable);
-
-    // Legacy list-style queries
-    @Query("{ 'is_active': true, 'status': 'AVAILABLE' }")
-    List<Item> findAllAvailable(Sort sort);
-
-    @Query("{ $text: { $search: ?0 }, 'is_active': true }")
-    List<Item> searchByText(String term, Sort sort);
-
-    List<Item> findByStatusIn(List<String> statuses, Sort sort);
-
-    List<Item> findByCondition(String condition, Sort sort);
-
-    @Query("{ 'deposit': { $gte: ?0, $lte: ?1 }, 'is_active': true }")
-    List<Item> findByDepositBetween(double min, double max, Sort sort);
-
-    @Query("{ 'is_active': true }")
-    long countActiveItems();
-
-    // Lightweight derived queries
-    List<Item> findByIsActiveTrueOrderByCreatedAtDesc();
-
-}
diff --git a/backend/src/main/java/com/locallend/locallend/repository/RatingRepository.java b/backend/src/main/java/com/locallend/locallend/repository/RatingRepository.java
deleted file mode 100644
index 5270bf1e046dec41b7655383a47896c4b0e3d9f2..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/repository/RatingRepository.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.locallend.locallend.repository;
-
-import com.locallend.locallend.model.Rating;
-import com.locallend.locallend.model.RatingType;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
-import org.springframework.data.mongodb.repository.Aggregation;
-import org.springframework.stereotype.Repository;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Repository for Rating entity.
- * Provides queries for user ratings, item ratings, and statistical aggregations.
- * Issue #23: Rating Entity, Repository, DTO
- */
-@Repository
-public interface RatingRepository extends MongoRepository<Rating, String> {
-    
-    // Basic Finders
-    List<Rating> findByRaterIdOrderByCreatedDateDesc(String raterId);
-    List<Rating> findByRateeIdOrderByCreatedDateDesc(String rateeId);
-    List<Rating> findByBookingId(String bookingId);
-    Optional<Rating> findByRaterIdAndBookingId(String raterId, String bookingId);
-    Optional<Rating> findByRaterIdAndItemId(String raterId, String itemId);
-    Optional<Rating> findByRaterIdAndRateeIdAndRatingType(String raterId, String rateeId, RatingType ratingType);
-    List<Rating> findByItemId(String itemId);
-    
-    // Rating Type Specific
-    List<Rating> findByRateeIdAndRatingTypeOrderByCreatedDateDesc(String rateeId, RatingType ratingType);
-    List<Rating> findByItemIdOrderByCreatedDateDesc(String itemId);
-    
-    // User Rating Queries (for trust score)
-    @Query("{'rateeId': ?0, 'ratingType': {'$in': ['USER_TO_USER', 'OWNER_TO_BORROWER', 'BORROWER_TO_OWNER']}}")
-    List<Rating> findUserRatingsForTrustScore(String userId);
-    
-    @Query("{'rateeId': ?0, 'ratingType': {'$in': ['USER_TO_USER', 'OWNER_TO_BORROWER', 'BORROWER_TO_OWNER']}, " +
-           "'createdDate': {'$gte': ?1}}")
-    List<Rating> findRecentUserRatings(String userId, LocalDateTime since);
-    
-    @Query("{'rateeId': ?0, 'ratingType': {'$in': ['USER_TO_USER', 'OWNER_TO_BORROWER', 'BORROWER_TO_OWNER']}, " +
-           "'isVerified': true}")
-    List<Rating> findVerifiedUserRatings(String userId);
-    
-    // Item Rating Queries
-    @Query("{'itemId': ?0, 'ratingType': 'USER_TO_ITEM', 'isVerified': true}")
-    List<Rating> findVerifiedItemRatings(String itemId);
-    
-    // Statistical Queries
-    long countByRateeIdAndRatingType(String rateeId, RatingType ratingType);
-    long countByRaterId(String raterId);
-    
-    // Average Rating Calculation using MongoDB Aggregation
-    @Aggregation(pipeline = {
-        "{ '$match': { 'rateeId': ?0, 'ratingType': { '$in': ['USER_TO_USER', 'OWNER_TO_BORROWER', 'BORROWER_TO_OWNER'] } } }",
-        "{ '$group': { '_id': '$rateeId', 'averageRating': { '$avg': '$ratingValue' }, 'totalRatings': { '$sum': 1 } } }"
-    })
-    Optional<UserRatingAggregate> calculateUserAverageRating(String userId);
-    
-    @Aggregation(pipeline = {
-        "{ '$match': { 'itemId': ?0, 'ratingType': 'USER_TO_ITEM' } }",
-        "{ '$group': { '_id': '$itemId', 'averageRating': { '$avg': '$ratingValue' }, 'totalRatings': { '$sum': 1 } } }"
-    })
-    Optional<ItemRatingAggregate> calculateItemAverageRating(String itemId);
-    
-    // Aggregation Result Interfaces
-    interface UserRatingAggregate {
-        String getId();
-        Double getAverageRating();
-        Long getTotalRatings();
-    }
-    
-    interface ItemRatingAggregate {
-        String getId();
-        Double getAverageRating();
-        Long getTotalRatings();
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/repository/UserRepository.java b/backend/src/main/java/com/locallend/locallend/repository/UserRepository.java
deleted file mode 100644
index ea71a01736bf0befc66074f130ed8f7e5621817a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/repository/UserRepository.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.locallend.locallend.repository;
-import com.locallend.locallend.model.User;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
-
-import java.util.List;
-import java.util.Optional;
-
-/** 
-repository for the User entity . Provide CRUD operation ;
-**/
-
-public interface UserRepository extends MongoRepository<User, String>{
-    
-    // Find user by username
-    Optional<User> findByUsername(String username);
-    
-    // Find user by email
-    Optional<User> findByEmail(String email);
-    
-    // Find user by username OR email
-    @Query("{'$or': [{'username': ?0}, {'email': ?0}]}")
-    Optional<User> findByUsernameOrEmail(String usernameOrEmail);
-    
-    // Count active users
-    Long countByIsActiveTrue();
-    
-    // Find active users with pagination
-    Page<User> findByIsActiveTrue(Pageable pageable);
-    
-    // Find top-rated active users
-    @Query("{'isActive': true}")
-    List<User> findTopRatedActiveUsers(Pageable pageable);
-    
-    // Search active users by name or username
-    @Query("{'isActive': true, '$or': [{'name': {'$regex': ?0, '$options': 'i'}}, {'username': {'$regex': ?0, '$options': 'i'}}]}")
-    List<User> searchActiveUsersByNameOrUsername(String searchTerm);
-    
-    // Issue #29: Geospatial queries for proximity-based features
-    
-    // Find active users near a location within a given distance
-    List<User> findByLocationNearAndIsActiveTrue(Point location, Distance distance);
-    
-    // Find active users with minimum trust score
-    @Query("{'isActive': true, 'trust_score': {'$gte': ?0}}")
-    List<User> findActiveUsersWithMinTrustScore(Double minTrustScore);
-    
-    // Issue #25: Update user trust score
-    // This is a custom method that will be implemented in RatingService
-    // using direct MongoDB update operations or by loading and saving the user
-    default void updateTrustScore(String userId, Double trustScore) {
-        Optional<User> userOpt = findById(userId);
-        if (userOpt.isPresent()) {
-            User user = userOpt.get();
-            user.setTrustScore(trustScore);
-            user.setLastTrustScoreUpdate(java.time.LocalDateTime.now());
-            save(user);
-        }
-    }
-}
-
diff --git a/backend/src/main/java/com/locallend/locallend/security/JwtAuthenticationFilter.java b/backend/src/main/java/com/locallend/locallend/security/JwtAuthenticationFilter.java
deleted file mode 100644
index 0090ca35cd7cc19bf42998b3737e5ee83d0547da..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/security/JwtAuthenticationFilter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.locallend.locallend.security;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import java.io.IOException;
-
-/**
- * JWT authentication filter that intercepts requests and validates tokens.
- * Extracts Bearer token from Authorization header and sets SecurityContext.
- */
-public class JwtAuthenticationFilter extends OncePerRequestFilter {
-
-    private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationFilter.class);
-    
-    private final JwtTokenProvider tokenProvider;
-    private final MongoUserDetailsService userDetailsService;
-
-    public JwtAuthenticationFilter(JwtTokenProvider tokenProvider,
-                                   MongoUserDetailsService userDetailsService) {
-        this.tokenProvider = tokenProvider;
-        this.userDetailsService = userDetailsService;
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
-            throws ServletException, IOException {
-
-        String requestURI = req.getRequestURI();
-        String bearer = req.getHeader("Authorization");
-        
-        logger.debug("JWT Filter - Request: {} {}", req.getMethod(), requestURI);
-        
-        if (StringUtils.hasText(bearer) && bearer.startsWith("Bearer ")) {
-            String token = bearer.substring(7);
-            logger.debug("JWT Filter - Token found for request: {}", requestURI);
-            
-            if (tokenProvider.validate(token)) {
-                String username = tokenProvider.getUsername(token);
-                logger.debug("JWT Filter - Valid token for user: {}", username);
-                
-                var userDetails = userDetailsService.loadUserByUsername(username);
-                var auth = new UsernamePasswordAuthenticationToken(
-                        userDetails, null, userDetails.getAuthorities());
-                auth.setDetails(new WebAuthenticationDetailsSource().buildDetails(req));
-                SecurityContextHolder.getContext().setAuthentication(auth);
-            } else {
-                logger.warn("JWT Filter - Invalid token for request: {}", requestURI);
-            }
-        } else {
-            logger.debug("JWT Filter - No bearer token for request: {}", requestURI);
-        }
-        
-        chain.doFilter(req, res);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/security/JwtTokenProvider.java b/backend/src/main/java/com/locallend/locallend/security/JwtTokenProvider.java
deleted file mode 100644
index 2606e3c1ee152a8a3984033ea2951db0c6fcd037..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/security/JwtTokenProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.locallend.locallend.security;
-
-import io.jsonwebtoken.*;
-import io.jsonwebtoken.security.Keys;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.crypto.SecretKey;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-
-/**
- * JWT token provider for generating and validating tokens.
- * Uses JJWT library with HS256 algorithm.
- */
-@Component
-public class JwtTokenProvider {
-
-    @Value("${app.jwt.secret:change-me-this-is-a-very-long-secret-key-for-jwt-signing}")
-    private String jwtSecret;
-
-    @Value("${app.jwt.expiration-ms:86400000}")
-    private long jwtExpirationMs;
-
-    /**
-     * Generate JWT token for a username.
-     * @param username Username to embed in token
-     * @return JWT token string
-     */
-    public String generateToken(String username) {
-        Date now = new Date();
-        Date exp = new Date(now.getTime() + jwtExpirationMs);
-        
-        SecretKey key = Keys.hmacShaKeyFor(jwtSecret.getBytes(StandardCharsets.UTF_8));
-        
-        return Jwts.builder()
-                .setSubject(username)
-                .setIssuedAt(now)
-                .setExpiration(exp)
-                .signWith(key, SignatureAlgorithm.HS256)
-                .compact();
-    }
-
-    /**
-     * Extract username from JWT token.
-     * @param token JWT token
-     * @return Username from token subject
-     */
-    public String getUsername(String token) {
-        SecretKey key = Keys.hmacShaKeyFor(jwtSecret.getBytes(StandardCharsets.UTF_8));
-        return Jwts.parserBuilder()
-                .setSigningKey(key)
-                .build()
-                .parseClaimsJws(token)
-                .getBody()
-                .getSubject();
-    }
-
-    /**
-     * Validate JWT token.
-     * @param token JWT token to validate
-     * @return true if valid, false otherwise
-     */
-    public boolean validate(String token) {
-        try {
-            SecretKey key = Keys.hmacShaKeyFor(jwtSecret.getBytes(StandardCharsets.UTF_8));
-            Jwts.parserBuilder()
-                    .setSigningKey(key)
-                    .build()
-                    .parseClaimsJws(token);
-            return true;
-        } catch (JwtException | IllegalArgumentException ex) {
-            // Log error in production (not logging here to avoid token exposure)
-            return false;
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/security/MongoUserDetailsService.java b/backend/src/main/java/com/locallend/locallend/security/MongoUserDetailsService.java
deleted file mode 100644
index f0c61182678840d710d9439fa72f4655cf49cfc9..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/security/MongoUserDetailsService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.locallend.locallend.security;
-
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.repository.UserRepository;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-/**
- * Custom UserDetailsService that loads users from MongoDB.
- * Supports authentication by username or email.
- */
-@Service
-public class MongoUserDetailsService implements UserDetailsService {
-
-    private final UserRepository userRepository;
-
-    public MongoUserDetailsService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Load user by username or email.
-     * @param username Username or email
-     * @return MongoUserPrincipal wrapping the user
-     * @throws UsernameNotFoundException if user not found
-     */
-    @Override
-    public MongoUserPrincipal loadUserByUsername(String username) throws UsernameNotFoundException {
-        User user = userRepository.findByUsername(username)
-                .orElseGet(() -> userRepository.findByEmail(username)
-                        .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username)));
-        return new MongoUserPrincipal(user);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/security/MongoUserPrincipal.java b/backend/src/main/java/com/locallend/locallend/security/MongoUserPrincipal.java
deleted file mode 100644
index 945ceec9b7ab12a086f7618d5e6074213afa78f7..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/security/MongoUserPrincipal.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.locallend.locallend.security;
-
-import com.locallend.locallend.model.User;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Bridge between MongoDB User entity and Spring Security UserDetails.
- * Wraps user information for authentication and authorization.
- */
-public class MongoUserPrincipal implements UserDetails {
-
-    private final String id;
-    private final String username;
-    private final String password;
-    private final boolean active;
-    private final String role;
-
-    public MongoUserPrincipal(User user) {
-        this.id = user.getId();
-        this.username = user.getUsername();
-        this.password = user.getPassword();
-        this.active = Boolean.TRUE.equals(user.getIsActive());
-        this.role = user.getRole() != null ? user.getRole() : "USER";
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return List.of(new SimpleGrantedAuthority("ROLE_" + role));
-    }
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return active;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/BookingService.java b/backend/src/main/java/com/locallend/locallend/service/BookingService.java
deleted file mode 100644
index ea3995bdc5a3650957b3f678cc41142404b7c89b..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/BookingService.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.dto.request.BookingRequestDto;
-import com.locallend.locallend.dto.response.BookingResponseDto;
-import com.locallend.locallend.exception.BookingConflictException;
-import com.locallend.locallend.exception.BookingNotFoundException;
-import com.locallend.locallend.exception.InvalidBookingPeriodException;
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.repository.BookingRepository;
-import com.locallend.locallend.repository.ItemRepository;
-import com.locallend.locallend.repository.UserRepository;
-import com.locallend.locallend.util.BookingFactory;
-import com.locallend.locallend.util.BookingMapper;
-import com.locallend.locallend.util.BookingValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-@Transactional
-public class BookingService {
-
-    private static final Logger logger = LoggerFactory.getLogger(BookingService.class);
-
-    private final BookingRepository bookingRepository;
-    private final ItemRepository itemRepository;
-    private final UserRepository userRepository;
-    private final BookingFactory bookingFactory;
-    private final BookingMapper bookingMapper;
-    private final BookingValidator bookingValidator;
-
-    public BookingService(BookingRepository bookingRepository,
-                          ItemRepository itemRepository,
-                          UserRepository userRepository,
-                          BookingFactory bookingFactory,
-                          BookingMapper bookingMapper,
-                          BookingValidator bookingValidator) {
-        this.bookingRepository = bookingRepository;
-        this.itemRepository = itemRepository;
-        this.userRepository = userRepository;
-        this.bookingFactory = bookingFactory;
-        this.bookingMapper = bookingMapper;
-        this.bookingValidator = bookingValidator;
-    }
-
-    public BookingResponseDto createBooking(BookingRequestDto request, String borrowerId) {
-        logger.info("Creating booking for item {} by borrower {}", request.getItemId(), borrowerId);
-
-        // Fetch entities
-        Item item = itemRepository.findById(request.getItemId())
-                .orElseThrow(() -> new IllegalArgumentException("Item not found"));
-        User borrower = userRepository.findById(borrowerId)
-                .orElseThrow(() -> new IllegalArgumentException("Borrower not found"));
-        User owner = item.getOwner();
-        if (owner == null) {
-            throw new IllegalArgumentException("Item has no owner");
-        }
-
-        // Comprehensive validation
-        try {
-            bookingValidator.validateAvailability(item, request.getStartDate(), request.getEndDate());
-            bookingValidator.validateBorrowerEligibility(borrower, owner);
-            bookingValidator.validateNoConflicts(item.getId(), request.getStartDate(), 
-                                                 request.getEndDate(), bookingRepository);
-        } catch (BookingConflictException | InvalidBookingPeriodException e) {
-            logger.warn("Booking validation failed: {}", e.getMessage());
-            throw e;
-        }
-
-        // Create booking
-        Booking booking = bookingFactory.createFromRequest(
-                item, borrower, owner,
-                request.getStartDate(), request.getEndDate(),
-                request.getBookingNotes(), request.getDepositAmount()
-        );
-
-        Booking saved = bookingRepository.save(booking);
-        logger.info("Booking {} created successfully", saved.getId());
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    @Transactional(readOnly = true)
-    public BookingResponseDto getBookingById(String id) {
-        Booking b = bookingRepository.findById(id)
-                .orElseThrow(() -> new BookingNotFoundException(id));
-        return bookingMapper.toBookingResponseDto(b);
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getBookingsForBorrower(String borrowerId) {
-        return bookingMapper.toBookingResponseDtoList(bookingRepository.findByBorrowerId(borrowerId));
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getBookingsForOwner(String ownerId) {
-        return bookingMapper.toBookingResponseDtoList(bookingRepository.findByOwnerId(ownerId));
-    }
-
-    public BookingResponseDto confirm(String bookingId, String ownerId, String ownerNotes) {
-        logger.info("Owner {} confirming booking {}", ownerId, bookingId);
-        
-        Booking b = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(b, ownerId, "OWNER");
-        bookingValidator.validateStatusTransition(b, com.locallend.locallend.model.enums.BookingStatus.CONFIRMED);
-        
-        b.confirm(ownerNotes);
-        Booking saved = bookingRepository.save(b);
-        logger.info("Booking {} confirmed", bookingId);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    public BookingResponseDto activate(String bookingId, String borrowerId) {
-        logger.info("Borrower {} activating booking {}", borrowerId, bookingId);
-        
-        Booking b = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(b, borrowerId, "BORROWER");
-        bookingValidator.validateStatusTransition(b, com.locallend.locallend.model.enums.BookingStatus.ACTIVE);
-        
-        b.activate();
-        
-        // Mark item as borrowed
-        Item item = b.getItem();
-        if (item != null) {
-            try {
-                item.markAsBorrowed();
-                itemRepository.save(item);
-            } catch (IllegalStateException e) {
-                logger.warn("Could not mark item as borrowed: {}", e.getMessage());
-            }
-        }
-        
-        Booking saved = bookingRepository.save(b);
-        logger.info("Booking {} activated", bookingId);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    public BookingResponseDto complete(String bookingId, String borrowerId) {
-        logger.info("Borrower {} completing booking {}", borrowerId, bookingId);
-        
-        Booking b = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(b, borrowerId, "BORROWER");
-        bookingValidator.validateStatusTransition(b, com.locallend.locallend.model.enums.BookingStatus.COMPLETED);
-        
-        b.complete();
-        
-        // Mark item as available again
-        Item item = b.getItem();
-        if (item != null && item.getStatus() == com.locallend.locallend.model.enums.ItemStatus.BORROWED) {
-            item.setStatus(com.locallend.locallend.model.enums.ItemStatus.AVAILABLE);
-            itemRepository.save(item);
-        }
-        
-        Booking saved = bookingRepository.save(b);
-        logger.info("Booking {} completed", bookingId);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    public BookingResponseDto cancel(String bookingId, String borrowerId, String reason) {
-        logger.info("Borrower {} cancelling booking {}", borrowerId, bookingId);
-        
-        Booking b = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(b, borrowerId, "BORROWER");
-        
-        if (!b.getStatus().canBeCancelled()) {
-            throw new IllegalStateException("Booking cannot be cancelled in current status: " + b.getStatus());
-        }
-        
-        b.cancel(reason != null ? reason : "Cancelled by borrower");
-        Booking saved = bookingRepository.save(b);
-        logger.info("Booking {} cancelled", bookingId);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    public BookingResponseDto reject(String bookingId, String ownerId, String reason) {
-        logger.info("Owner {} rejecting booking {}", ownerId, bookingId);
-        
-        Booking b = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(b, ownerId, "OWNER");
-        
-        b.reject(reason != null ? reason : "Rejected by owner");
-        Booking saved = bookingRepository.save(b);
-        logger.info("Booking {} rejected", bookingId);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getActiveBookings() {
-        return bookingMapper.toBookingResponseDtoList(bookingRepository.findActiveBookings());
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getOverdueBookings() {
-        return bookingMapper.toBookingResponseDtoList(bookingRepository.findOverdueBookings(LocalDateTime.now()));
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getBookingsByStatus(com.locallend.locallend.model.enums.BookingStatus status, String userId) {
-        logger.info("Fetching bookings with status {} for user {}", status, userId);
-        List<Booking> bookings = bookingRepository.findByBorrowerIdAndStatusOrderByCreatedDateDesc(userId, status);
-        return bookingMapper.toBookingResponseDtoList(bookings);
-    }
-
-    @Transactional(readOnly = true)
-    public List<BookingResponseDto> getActiveBookingsForItem(String itemId) {
-        logger.info("Fetching active bookings for item {}", itemId);
-        List<Booking> bookings = bookingRepository.findActiveBookings();
-        return bookingMapper.toBookingResponseDtoList(
-            bookings.stream().filter(b -> itemId.equals(b.getItemId())).toList()
-        );
-    }
-
-    @Transactional(readOnly = true)
-    public long countCompletedBookings(String userId, boolean asOwner, LocalDateTime start, LocalDateTime end) {
-        if (asOwner) {
-            return bookingRepository.countCompletedBookingsByOwnerInPeriod(userId, start, end);
-        } else {
-            return bookingRepository.countCompletedBookingsByBorrowerInPeriod(userId, start, end);
-        }
-    }
-
-    /**
-     * Update booking status with proper validation.
-     */
-    public BookingResponseDto updateBookingStatus(String bookingId, 
-                                                  com.locallend.locallend.model.enums.BookingStatus newStatus, 
-                                                  String userId) {
-        logger.info("Updating booking {} to status {}", bookingId, newStatus);
-        
-        Booking booking = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new BookingNotFoundException(bookingId));
-        
-        bookingValidator.validateAuthorization(booking, userId, "EITHER");
-        bookingValidator.validateStatusTransition(booking, newStatus);
-        
-        booking.setStatus(newStatus);
-        booking.setUpdatedDate(LocalDateTime.now());
-        
-        Booking saved = bookingRepository.save(booking);
-        return bookingMapper.toBookingResponseDto(saved);
-    }
-
-    /**
-     * Process overdue bookings - mark ACTIVE bookings past end date as OVERDUE.
-     */
-    @Transactional
-    public int processOverdueBookings() {
-        logger.info("Processing overdue bookings");
-        List<Booking> overdueBookings = bookingRepository.findOverdueBookings(LocalDateTime.now());
-        
-        int count = 0;
-        for (Booking booking : overdueBookings) {
-            if (booking.getStatus() == com.locallend.locallend.model.enums.BookingStatus.ACTIVE) {
-                booking.markOverdue();
-                bookingRepository.save(booking);
-                count++;
-            }
-        }
-        
-        logger.info("Marked {} bookings as overdue", count);
-        return count;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/CategoryService.java b/backend/src/main/java/com/locallend/locallend/service/CategoryService.java
deleted file mode 100644
index 994bfde9f115ed23ba9c8a1c26c3ea01e16be140..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/CategoryService.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.dto.CategoryDto;
-import com.locallend.locallend.dto.CreateCategoryRequest;
-import com.locallend.locallend.exception.CategoryNotFoundException;
-import com.locallend.locallend.model.Category;
-import com.locallend.locallend.repository.CategoryRepository;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Service
-@Transactional
-public class CategoryService {
-
-    private static final Logger logger = LoggerFactory.getLogger(CategoryService.class);
-
-    private final CategoryRepository categoryRepository;
-
-    public CategoryService(CategoryRepository categoryRepository) {
-        this.categoryRepository = categoryRepository;
-    }
-
-    public CategoryDto createCategory(CreateCategoryRequest request) {
-        logger.info("Creating category with name: {}", request.getName());
-
-        if (categoryRepository.existsByNameIgnoreCase(request.getName())) {
-            throw new IllegalArgumentException("Category with name '" + request.getName() + "' already exists");
-        }
-
-        Category parentCategory = null;
-        if (request.hasParentCategory()) {
-            parentCategory = categoryRepository.findById(request.getParentCategoryId())
-                    .orElseThrow(() -> CategoryNotFoundException.byId(request.getParentCategoryId()));
-        }
-
-        Category category = new Category(request.getName(), request.getDescription(), request.getParentCategoryId());
-        Category savedCategory = categoryRepository.save(category);
-
-        logger.info("Category created successfully with ID: {}", savedCategory.getId());
-        return convertToDto(savedCategory, parentCategory);
-    }
-
-    @Transactional(readOnly = true)
-    public List<CategoryDto> getAllCategories(String sortBy) {
-        logger.info("Fetching all categories with sort: {}", sortBy);
-
-        Sort sort = createSort(sortBy);
-        List<Category> categories = categoryRepository.findAllActiveCategories(sort);
-
-        return categories.stream()
-                .map(this::convertToDto)
-                .collect(Collectors.toList());
-    }
-
-    @Transactional(readOnly = true)
-    public CategoryDto getCategoryById(String categoryId) {
-        logger.info("Fetching category by ID: {}", categoryId);
-
-        Category category = categoryRepository.findById(categoryId)
-                .orElseThrow(() -> CategoryNotFoundException.byId(categoryId));
-
-        if (!category.isActive()) {
-            throw new CategoryNotFoundException("Category with ID '" + categoryId + "' is not active", categoryId, null);
-        }
-
-        return convertToDto(category);
-    }
-
-    @Transactional(readOnly = true)
-    public List<CategoryDto> getRootCategories(String sortBy) {
-        logger.info("Fetching root categories with sort: {}", sortBy);
-
-        Sort sort = createSort(sortBy);
-        List<Category> rootCategories = categoryRepository.findRootCategories(sort);
-
-        return rootCategories.stream()
-                .map(this::convertToDto)
-                .collect(Collectors.toList());
-    }
-
-    @Transactional(readOnly = true)
-    public List<CategoryDto> getSubcategories(String parentCategoryId, String sortBy) {
-        logger.info("Fetching subcategories for parent ID: {}", parentCategoryId);
-
-        Category parentCategory = categoryRepository.findById(parentCategoryId)
-                .orElseThrow(() -> CategoryNotFoundException.byId(parentCategoryId));
-
-        Sort sort = createSort(sortBy);
-        List<Category> subcategories = categoryRepository.findByParentCategoryId(parentCategoryId, sort);
-
-        return subcategories.stream()
-                .map(category -> convertToDto(category, parentCategory))
-                .collect(Collectors.toList());
-    }
-
-    @Transactional(readOnly = true)
-    public List<CategoryDto> searchCategories(String searchTerm, String sortBy) {
-        logger.info("Searching categories with term: {}", searchTerm);
-
-        Sort sort = createSort(sortBy);
-        List<Category> categories = categoryRepository.searchCategoriesByText(searchTerm, sort);
-
-        return categories.stream()
-                .map(this::convertToDto)
-                .collect(Collectors.toList());
-    }
-
-    @Transactional(readOnly = true)
-    public List<CategoryDto> getPopularCategories(long minItemCount) {
-        logger.info("Fetching popular categories with minimum {} items", minItemCount);
-
-        Sort sort = Sort.by(Sort.Direction.DESC, "item_count");
-        List<Category> categories = categoryRepository.findCategoriesWithMinimumItems(minItemCount, sort);
-
-        return categories.stream()
-                .map(this::convertToDto)
-                .collect(Collectors.toList());
-    }
-
-    public CategoryDto updateCategoryStatus(String categoryId, boolean isActive) {
-        logger.info("Updating category {} status to: {}", categoryId, isActive);
-
-        Category category = categoryRepository.findById(categoryId)
-                .orElseThrow(() -> CategoryNotFoundException.byId(categoryId));
-
-        category.setActive(isActive);
-        Category updatedCategory = categoryRepository.save(category);
-
-        logger.info("Category {} status updated successfully", categoryId);
-        return convertToDto(updatedCategory);
-    }
-
-    public void incrementItemCount(String categoryId) {
-        logger.debug("Incrementing item count for category: {}", categoryId);
-
-        Category category = categoryRepository.findById(categoryId)
-                .orElseThrow(() -> CategoryNotFoundException.byId(categoryId));
-
-        category.incrementItemCount();
-        categoryRepository.save(category);
-    }
-
-    public void decrementItemCount(String categoryId) {
-        logger.debug("Decrementing item count for category: {}", categoryId);
-
-        Category category = categoryRepository.findById(categoryId)
-                .orElseThrow(() -> CategoryNotFoundException.byId(categoryId));
-
-        category.decrementItemCount();
-        categoryRepository.save(category);
-    }
-
-    private CategoryDto convertToDto(Category category) {
-        return convertToDto(category, null);
-    }
-
-    private CategoryDto convertToDto(Category category, Category parentCategory) {
-        String parentCategoryName = null;
-        if (category.hasParent() && parentCategory != null) {
-            parentCategoryName = parentCategory.getName();
-        } else if (category.hasParent()) {
-            Optional<Category> parent = categoryRepository.findById(category.getParentCategoryId());
-            parentCategoryName = parent.map(Category::getName).orElse(null);
-        }
-
-        boolean hasSubcategories = !categoryRepository.findByParentCategoryId(
-                category.getId(), Sort.by("name")).isEmpty();
-
-        return CategoryDto.builder()
-                .id(category.getId())
-                .name(category.getName())
-                .description(category.getDescription())
-                .parentCategoryId(category.getParentCategoryId())
-                .parentCategoryName(parentCategoryName)
-                .isActive(category.isActive())
-                .itemCount(category.getItemCount())
-                .hasSubcategories(hasSubcategories)
-                .createdAt(category.getCreatedAt())
-                .updatedAt(category.getUpdatedAt())
-                .build();
-    }
-
-    private Sort createSort(String sortBy) {
-        if (sortBy == null || sortBy.isEmpty()) {
-            return Sort.by(Sort.Direction.ASC, "name");
-        }
-
-        switch (sortBy.toLowerCase()) {
-            case "name":
-            case "name_asc":
-                return Sort.by(Sort.Direction.ASC, "name");
-            case "name_desc":
-                return Sort.by(Sort.Direction.DESC, "name");
-            case "created":
-            case "created_desc":
-                return Sort.by(Sort.Direction.DESC, "created_at");
-            case "created_asc":
-                return Sort.by(Sort.Direction.ASC, "created_at");
-            case "popular":
-            case "item_count_desc":
-                return Sort.by(Sort.Direction.DESC, "item_count");
-            case "item_count_asc":
-                return Sort.by(Sort.Direction.ASC, "item_count");
-            default:
-                return Sort.by(Sort.Direction.ASC, "name");
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/ImageService.java b/backend/src/main/java/com/locallend/locallend/service/ImageService.java
deleted file mode 100644
index c38fc47416d19aba9663bff2f34adb1fab3d8fd7..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/ImageService.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.cloudinary.Cloudinary;
-import com.cloudinary.utils.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Service for handling image uploads to Cloudinary.
- * Provides methods for uploading, deleting, and managing images.
- */
-@Service
-public class ImageService {
-
-    private static final Logger logger = LoggerFactory.getLogger(ImageService.class);
-    
-    private final Cloudinary cloudinary;
-    
-    // Allowed image formats
-    private static final Set<String> ALLOWED_FORMATS = Set.of(
-            "image/jpeg", "image/jpg", "image/png", "image/gif", "image/webp"
-    );
-    
-    // Maximum file size: 10MB
-    private static final long MAX_FILE_SIZE = 10 * 1024 * 1024;
-
-    public ImageService(Cloudinary cloudinary) {
-        this.cloudinary = cloudinary;
-    }
-
-    /**
-     * Upload a single image to Cloudinary.
-     * @param file The image file to upload
-     * @param folder The folder in Cloudinary to upload to (e.g., "locallend/items")
-     * @return The secure URL of the uploaded image
-     * @throws IOException If upload fails
-     * @throws IllegalArgumentException If file validation fails
-     */
-    public String uploadImage(MultipartFile file, String folder) throws IOException {
-        validateImage(file);
-        
-        logger.info("Uploading image: {} to folder: {}", file.getOriginalFilename(), folder);
-        
-        Map<String, Object> uploadParams = ObjectUtils.asMap(
-                "folder", folder,
-                "resource_type", "image",
-                "quality", "auto:good",
-                "fetch_format", "auto"
-        );
-        
-        Map uploadResult = cloudinary.uploader().upload(file.getBytes(), uploadParams);
-        String imageUrl = (String) uploadResult.get("secure_url");
-        
-        logger.info("Image uploaded successfully: {}", imageUrl);
-        return imageUrl;
-    }
-
-    /**
-     * Upload multiple images to Cloudinary.
-     * @param files Array of image files to upload
-     * @param folder The folder in Cloudinary to upload to
-     * @return List of secure URLs of uploaded images
-     * @throws IOException If upload fails
-     */
-    public List<String> uploadMultipleImages(MultipartFile[] files, String folder) throws IOException {
-        List<String> imageUrls = new ArrayList<>();
-        
-        for (MultipartFile file : files) {
-            if (file != null && !file.isEmpty()) {
-                try {
-                    String imageUrl = uploadImage(file, folder);
-                    imageUrls.add(imageUrl);
-                } catch (Exception e) {
-                    logger.error("Failed to upload image: {}", file.getOriginalFilename(), e);
-                    // Continue with other files even if one fails
-                }
-            }
-        }
-        
-        return imageUrls;
-    }
-
-    /**
-     * Delete an image from Cloudinary using its public ID.
-     * @param imageUrl The full Cloudinary URL of the image
-     * @return true if deletion was successful, false otherwise
-     */
-    public boolean deleteImage(String imageUrl) {
-        try {
-            String publicId = extractPublicIdFromUrl(imageUrl);
-            if (publicId == null) {
-                logger.warn("Could not extract public ID from URL: {}", imageUrl);
-                return false;
-            }
-            
-            logger.info("Deleting image with public ID: {}", publicId);
-            Map result = cloudinary.uploader().destroy(publicId, ObjectUtils.emptyMap());
-            String resultStatus = (String) result.get("result");
-            
-            boolean success = "ok".equals(resultStatus);
-            logger.info("Image deletion result: {}", resultStatus);
-            return success;
-            
-        } catch (Exception e) {
-            logger.error("Failed to delete image: {}", imageUrl, e);
-            return false;
-        }
-    }
-
-    /**
-     * Delete multiple images from Cloudinary.
-     * @param imageUrls List of Cloudinary URLs to delete
-     * @return Number of successfully deleted images
-     */
-    public int deleteMultipleImages(List<String> imageUrls) {
-        int deletedCount = 0;
-        for (String imageUrl : imageUrls) {
-            if (deleteImage(imageUrl)) {
-                deletedCount++;
-            }
-        }
-        return deletedCount;
-    }
-
-    /**
-     * Validate image file before upload.
-     * @param file The file to validate
-     * @throws IllegalArgumentException If validation fails
-     */
-    private void validateImage(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("File is empty or null");
-        }
-        
-        String contentType = file.getContentType();
-        if (contentType == null || !ALLOWED_FORMATS.contains(contentType.toLowerCase())) {
-            throw new IllegalArgumentException(
-                    "Invalid file format. Allowed formats: JPEG, PNG, GIF, WebP"
-            );
-        }
-        
-        if (file.getSize() > MAX_FILE_SIZE) {
-            throw new IllegalArgumentException(
-                    "File size exceeds maximum limit of 10MB"
-            );
-        }
-        
-        logger.debug("File validation passed: {} ({})", file.getOriginalFilename(), contentType);
-    }
-
-    /**
-     * Extract Cloudinary public ID from full URL.
-     * Example: https://res.cloudinary.com/demo/image/upload/v1234567890/locallend/items/abc123.jpg
-     * Returns: locallend/items/abc123
-     * 
-     * @param imageUrl The full Cloudinary URL
-     * @return The public ID, or null if extraction fails
-     */
-    private String extractPublicIdFromUrl(String imageUrl) {
-        try {
-            if (imageUrl == null || !imageUrl.contains("cloudinary.com")) {
-                return null;
-            }
-            
-            // Extract the part after /upload/
-            String[] parts = imageUrl.split("/upload/");
-            if (parts.length < 2) {
-                return null;
-            }
-            
-            // Remove version identifier (v1234567890) and file extension
-            String pathAfterUpload = parts[1];
-            String[] pathParts = pathAfterUpload.split("/");
-            
-            // Skip version if present
-            int startIndex = pathParts[0].startsWith("v") ? 1 : 0;
-            
-            // Reconstruct public ID without extension
-            StringBuilder publicId = new StringBuilder();
-            for (int i = startIndex; i < pathParts.length; i++) {
-                if (i > startIndex) {
-                    publicId.append("/");
-                }
-                // Remove file extension from last part
-                String part = pathParts[i];
-                if (i == pathParts.length - 1) {
-                    int dotIndex = part.lastIndexOf('.');
-                    if (dotIndex > 0) {
-                        part = part.substring(0, dotIndex);
-                    }
-                }
-                publicId.append(part);
-            }
-            
-            return publicId.toString();
-            
-        } catch (Exception e) {
-            logger.error("Error extracting public ID from URL: {}", imageUrl, e);
-            return null;
-        }
-    }
-
-    /**
-     * Check if Cloudinary is properly configured.
-     * @return true if configured, false otherwise
-     */
-    public boolean isConfigured() {
-        try {
-            return cloudinary.config.cloudName != null 
-                    && !cloudinary.config.cloudName.equals("your_cloud_name");
-        } catch (Exception e) {
-            return false;
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/ItemService.java b/backend/src/main/java/com/locallend/locallend/service/ItemService.java
deleted file mode 100644
index f67471e253897f0f701737c237352d261381b122..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/ItemService.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.dto.CreateItemRequest;
-import com.locallend.locallend.dto.ItemDTO;
-import com.locallend.locallend.dto.UpdateItemRequest;
-import com.locallend.locallend.exception.ItemNotFoundException;
-import com.locallend.locallend.exception.UnauthorizedItemAccessException;
-import com.locallend.locallend.model.Category;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.model.enums.ItemStatus;
-import com.locallend.locallend.repository.CategoryRepository;
-import com.locallend.locallend.repository.ItemRepository;
-import com.locallend.locallend.repository.UserRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-@Transactional
-public class ItemService {
-
-    private static final Logger logger = LoggerFactory.getLogger(ItemService.class);
-
-    private final ItemRepository itemRepository;
-    private final UserRepository userRepository;
-    private final CategoryRepository categoryRepository;
-    private final ImageService imageService;
-
-    public ItemService(ItemRepository itemRepository, UserRepository userRepository, 
-                      CategoryRepository categoryRepository, ImageService imageService) {
-        this.itemRepository = itemRepository;
-        this.userRepository = userRepository;
-        this.categoryRepository = categoryRepository;
-        this.imageService = imageService;
-    }
-
-    public ItemDTO createItem(CreateItemRequest request, String ownerId) {
-        logger.info("Creating item '{}' for owner {}", request.getName(), ownerId);
-
-        User owner = userRepository.findById(ownerId).orElseThrow(() -> new IllegalArgumentException("Owner not found"));
-        Category category = categoryRepository.findById(request.getCategoryId())
-                .orElseThrow(() -> new IllegalArgumentException("Category not found"));
-
-        Item item = new Item();
-        item.setName(request.getName());
-        item.setDescription(request.getDescription());
-        item.setDeposit(request.getDeposit() != null ? request.getDeposit() : 0.0);
-        item.setImages(request.getImages());
-        if (request.getCondition() != null) {
-            item.setCondition(com.locallend.locallend.model.enums.ItemCondition.fromString(request.getCondition()));
-        }
-        item.setOwner(owner);
-        item.setCategory(category);
-
-        Item saved = itemRepository.save(item);
-        // increment owner's item count (denormalized)
-        owner.setItemCount(owner.getItemCount() + 1);
-        userRepository.save(owner);
-
-        return toItemDTO(saved);
-    }
-
-    @Transactional(readOnly = true)
-    public ItemDTO getItemById(String itemId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        return toItemDTO(item);
-    }
-
-    public ItemDTO updateItem(String itemId, UpdateItemRequest request, String currentUserId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        checkOwner(item, currentUserId);
-
-        if (request.getName() != null) item.setName(request.getName());
-        if (request.getDescription() != null) item.setDescription(request.getDescription());
-        if (request.getCondition() != null) item.setCondition(com.locallend.locallend.model.enums.ItemCondition.fromString(request.getCondition()));
-        if (request.getDeposit() != null) item.setDeposit(request.getDeposit());
-        
-        // Handle image updates - delete removed images from Cloudinary
-        if (request.getImages() != null) {
-            List<String> oldImages = item.getImages();
-            List<String> newImages = request.getImages();
-            
-            // Find images that were removed (in old but not in new)
-            if (oldImages != null && !oldImages.isEmpty()) {
-                List<String> removedImages = oldImages.stream()
-                    .filter(oldUrl -> !newImages.contains(oldUrl))
-                    .collect(java.util.stream.Collectors.toList());
-                
-                // Delete removed images from Cloudinary
-                if (!removedImages.isEmpty()) {
-                    logger.info("Deleting {} removed images from Cloudinary for item {}", 
-                               removedImages.size(), itemId);
-                    try {
-                        int deletedCount = imageService.deleteMultipleImages(removedImages);
-                        logger.info("Successfully deleted {} out of {} images from Cloudinary", 
-                                   deletedCount, removedImages.size());
-                    } catch (Exception e) {
-                        logger.warn("Failed to delete some images from Cloudinary: {}", e.getMessage());
-                        // Continue with update even if image deletion fails
-                    }
-                }
-            }
-            
-            item.setImages(newImages);
-        }
-        
-        if (request.getIsAvailable() != null) item.setActive(request.getIsAvailable());
-
-        Item updated = itemRepository.save(item);
-        return toItemDTO(updated);
-    }
-
-    public void deleteItem(String itemId, String currentUserId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        checkOwner(item, currentUserId);
-
-        // Soft delete - only delete if it's currently active
-        if (item.isActive()) {
-            // Delete images from Cloudinary before soft-deleting the item
-            if (item.getImages() != null && !item.getImages().isEmpty()) {
-                logger.info("Deleting {} images from Cloudinary for item {}", 
-                           item.getImages().size(), itemId);
-                try {
-                    int deletedCount = imageService.deleteMultipleImages(item.getImages());
-                    logger.info("Successfully deleted {} out of {} images from Cloudinary", 
-                               deletedCount, item.getImages().size());
-                } catch (Exception e) {
-                    logger.error("Failed to delete images from Cloudinary for item {}: {}", 
-                                itemId, e.getMessage());
-                    // Continue with soft delete even if image deletion fails
-                    // Images can be cleaned up manually or via scheduled task
-                }
-            }
-            
-            item.setActive(false);
-            itemRepository.save(item);
-
-            // decrement owner's item count
-            User owner = item.getOwner();
-            if (owner != null && owner.getItemCount() > 0) {
-                owner.setItemCount(owner.getItemCount() - 1);
-                userRepository.save(owner);
-            }
-        }
-    }
-
-    public ItemDTO reactivateItem(String itemId, String currentUserId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        checkOwner(item, currentUserId);
-
-        // Reactivate soft-deleted item
-        if (!item.isActive()) {
-            item.setActive(true);
-            Item saved = itemRepository.save(item);
-
-            // increment owner's item count
-            User owner = item.getOwner();
-            if (owner != null) {
-                owner.setItemCount(owner.getItemCount() + 1);
-                userRepository.save(owner);
-            }
-            
-            return toItemDTO(saved);
-        }
-        return toItemDTO(item);
-    }
-
-    public ItemDTO toggleAvailability(String itemId, String currentUserId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        checkOwner(item, currentUserId);
-
-        // Toggle between AVAILABLE and UNAVAILABLE (don't change isActive - that's for soft delete)
-        if (item.getStatus() == ItemStatus.AVAILABLE) {
-            item.setStatus(ItemStatus.UNAVAILABLE);
-        } else if (item.getStatus() == ItemStatus.UNAVAILABLE) {
-            item.setStatus(ItemStatus.AVAILABLE);
-        }
-        // Don't allow toggling if item is BORROWED
-        
-        Item saved = itemRepository.save(item);
-        return toItemDTO(saved);
-    }
-
-    public ItemDTO setAvailability(String itemId, boolean isAvailable, String currentUserId) {
-        Item item = itemRepository.findById(itemId).orElseThrow(() -> new ItemNotFoundException(itemId));
-        checkOwner(item, currentUserId);
-        item.setActive(isAvailable);
-        Item saved = itemRepository.save(item);
-        return toItemDTO(saved);
-    }
-
-    @Transactional(readOnly = true)
-    public Page<ItemDTO> getAvailableItems(int page, int size, String sortBy, String sortDir) {
-        Sort.Direction dir = "desc".equalsIgnoreCase(sortDir) ? Sort.Direction.DESC : Sort.Direction.ASC;
-        Pageable p = PageRequest.of(page, size, Sort.by(dir, sortBy == null ? "name" : sortBy));
-        Page<Item> items = itemRepository.findByIsActiveTrueAndStatus("AVAILABLE", p);
-        List<ItemDTO> dtos = items.stream().map(this::toItemDTO).collect(Collectors.toList());
-        return new PageImpl<>(dtos, p, items.getTotalElements());
-    }
-
-    @Transactional(readOnly = true)
-    public Page<ItemDTO> searchAvailableItems(String searchTerm, int page, int size) {
-        Pageable p = PageRequest.of(page, size);
-        Page<Item> items = itemRepository.searchAvailableItems(searchTerm, p);
-        List<ItemDTO> dtos = items.stream().map(this::toItemDTO).collect(Collectors.toList());
-        return new PageImpl<>(dtos, p, items.getTotalElements());
-    }
-
-    @Transactional(readOnly = true)
-    public Page<ItemDTO> getAvailableItemsByCategory(String categoryId, int page, int size) {
-        Category cat = categoryRepository.findById(categoryId).orElseThrow(() -> new IllegalArgumentException("Category not found"));
-        Pageable p = PageRequest.of(page, size);
-        Page<Item> items = itemRepository.findByIsActiveTrueAndCategory(cat, p);
-        List<ItemDTO> dtos = items.stream().map(this::toItemDTO).collect(Collectors.toList());
-        return new PageImpl<>(dtos, p, items.getTotalElements());
-    }
-
-    @Transactional(readOnly = true)
-    public Page<ItemDTO> getItemsByOwner(String ownerId, int page, int size) {
-        User owner = userRepository.findById(ownerId).orElseThrow(() -> new IllegalArgumentException("Owner not found"));
-        Pageable p = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
-        Page<Item> items = itemRepository.findByOwnerAndIsActiveTrue(owner, p);
-        List<ItemDTO> dtos = items.stream().map(this::toItemDTO).collect(Collectors.toList());
-        return new PageImpl<>(dtos, p, items.getTotalElements());
-    }
-
-    // Helpers
-    private void checkOwner(Item item, String currentUserId) {
-        if (item.getOwner() == null || !item.getOwner().getId().equals(currentUserId)) {
-            throw new UnauthorizedItemAccessException("User is not owner of the item");
-        }
-    }
-
-    private ItemDTO toItemDTO(Item item) {
-        return mapItemToDto(item);
-    }
-
-    private ItemDTO mapItemToDto(Item item) {
-        ItemDTO dto = new ItemDTO();
-        dto.setId(item.getId());
-        dto.setName(item.getName());
-        dto.setDescription(item.getDescription());
-        dto.setCondition(item.getCondition() != null ? item.getCondition().name() : null);
-        dto.setStatus(item.getStatus() != null ? item.getStatus().name() : null);
-        dto.setDeposit(item.getDeposit());
-        dto.setImages(item.getImages());
-        dto.setAverageRating(item.getAverageRating());
-        if (item.getOwner() != null) {
-            dto.setOwnerId(item.getOwner().getId());
-            dto.setOwnerName(item.getOwner().getName());
-        }
-        if (item.getCategory() != null) {
-            dto.setCategoryId(item.getCategory().getId());
-            dto.setCategoryName(item.getCategory().getName());
-        }
-        dto.setCanBeBorrowed(item.canBeBorrowed());
-        dto.setCreatedAt(item.getCreatedAt());
-        dto.setUpdatedAt(item.getUpdatedAt());
-        return dto;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/PasswordService.java b/backend/src/main/java/com/locallend/locallend/service/PasswordService.java
deleted file mode 100644
index dc985000499736b0b79679246b7387a7874d4276..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/PasswordService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.locallend.locallend.service;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-/**
- * Centralized password hashing and verification service.
- * Uses BCrypt for secure password storage.
- */
-@Service
-public class PasswordService {
-    private final PasswordEncoder encoder = new BCryptPasswordEncoder();
-
-    /**
-     * Hash a raw password using BCrypt.
-     * @param rawPassword Plain text password
-     * @return Hashed password
-     */
-    public String hash(String rawPassword) {
-        return encoder.encode(rawPassword);
-    }
-
-    /**
-     * Verify a raw password against a hashed password.
-     * @param rawPassword Plain text password
-     * @param hashedPassword Hashed password from database
-     * @return true if passwords match, false otherwise
-     */
-    public boolean matches(String rawPassword, String hashedPassword) {
-        return encoder.matches(rawPassword, hashedPassword);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/RatingService.java b/backend/src/main/java/com/locallend/locallend/service/RatingService.java
deleted file mode 100644
index e6b7ed099e5a66379fdb4fc0c22e741302261f25..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/RatingService.java
+++ /dev/null
@@ -1,577 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.model.Rating;
-import com.locallend.locallend.model.RatingType;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.model.enums.BookingStatus;
-import com.locallend.locallend.repository.RatingRepository;
-import com.locallend.locallend.repository.UserRepository;
-import com.locallend.locallend.repository.ItemRepository;
-import com.locallend.locallend.repository.BookingRepository;
-import com.locallend.locallend.util.TrustScoreCalculator;
-import com.locallend.locallend.exception.ResourceNotFoundException;
-import com.locallend.locallend.exception.ValidationException;
-import com.locallend.locallend.exception.RatingNotFoundException;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Optional;
-import java.time.LocalDateTime;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Service class for managing ratings in the LocalLend platform.
- * 
- * This service handles all rating-related business logic including:
- * - Creating and updating ratings
- * - Calculating user trust scores
- * - Computing item average ratings
- * - Enforcing business rules and validations
- * - Managing rating lifecycle operations
- * 
- * Key Business Rules:
- * - Users cannot rate their own items
- * - Users can only submit one rating per item
- * - Ratings must be between 1-5 stars
- * - Trust scores are recalculated after each rating change
- * - Ratings can be edited within 7 days of creation
- * 
- * Issue #24: Rating Service Logic
- */
-@Service
-@Transactional
-public class RatingService {
-    
-    private static final Logger logger = LoggerFactory.getLogger(RatingService.class);
-    private static final int RATING_EDIT_WINDOW_DAYS = 7;
-    
-    private final RatingRepository ratingRepository;
-    private final UserRepository userRepository;
-    private final ItemRepository itemRepository;
-    private final BookingRepository bookingRepository;
-    private final TrustScoreCalculator trustScoreCalculator;
-    
-    public RatingService(RatingRepository ratingRepository,
-                        UserRepository userRepository,
-                        ItemRepository itemRepository,
-                        BookingRepository bookingRepository,
-                        TrustScoreCalculator trustScoreCalculator) {
-        this.ratingRepository = ratingRepository;
-        this.userRepository = userRepository;
-        this.itemRepository = itemRepository;
-        this.bookingRepository = bookingRepository;
-        this.trustScoreCalculator = trustScoreCalculator;
-    }
-    
-    /**
-     * Create a new item rating.
-     * 
-     * @param raterId ID of the user giving the rating
-     * @param itemId ID of the item being rated
-     * @param ratingValue Rating value (1-5)
-     * @param comment Optional comment with the rating
-     * @param isAnonymous Whether the rating is anonymous
-     * @return The created Rating object
-     * @throws ValidationException if business rules are violated
-     * @throws ResourceNotFoundException if user or item doesn't exist
-     */
-    public Rating createItemRating(String raterId, String itemId, Integer ratingValue, 
-                                  String comment, Boolean isAnonymous) {
-        logger.info("Creating item rating: raterId={}, itemId={}, rating={}", raterId, itemId, ratingValue);
-        
-        // Validate inputs
-        validateRatingInput(ratingValue);
-        
-        // Get user and item entities
-        Item item = getItemById(itemId);
-        
-        // Apply business rules
-        if (item.getOwner() != null && item.getOwner().getId().equals(raterId)) {
-            throw new ValidationException("Users cannot rate their own items");
-        }
-        
-        // Check for duplicate rating
-        Optional<Rating> existingRating = ratingRepository.findByRaterIdAndItemId(raterId, itemId);
-        if (existingRating.isPresent()) {
-            throw new ValidationException("User has already rated this item. Use updateRating instead.");
-        }
-        
-        // Create rating
-        Rating newRating = new Rating();
-        newRating.setRaterId(raterId);
-        newRating.setRateeId(item.getOwner() != null ? item.getOwner().getId() : null); // Item owner is the ratee
-        newRating.setItemId(itemId);
-        newRating.setRatingType(RatingType.USER_TO_ITEM);
-        newRating.setRatingValue(ratingValue);
-        newRating.setComment(sanitizeComment(comment));
-        newRating.setIsAnonymous(isAnonymous != null ? isAnonymous : false);
-        
-        // Save rating
-        Rating savedRating = ratingRepository.save(newRating);
-        
-        // Update derived metrics asynchronously
-        updateItemAverageRating(itemId);
-        
-        logger.info("Successfully created item rating with ID: {}", savedRating.getId());
-        return savedRating;
-    }
-    
-    /**
-     * Create a user-to-user rating (trust rating).
-     * 
-     * @param raterId ID of the user giving the rating
-     * @param ratedUserId ID of the user being rated
-     * @param ratingType Type of user rating (USER_TO_USER, OWNER_TO_BORROWER, BORROWER_TO_OWNER)
-     * @param ratingValue Rating value (1-5)
-     * @param comment Optional comment with the rating
-     * @param bookingId Optional booking ID for verification
-     * @return The created Rating object
-     */
-    public Rating createUserRating(String raterId, String ratedUserId, RatingType ratingType,
-                                  Integer ratingValue, String comment, String bookingId) {
-        logger.info("Creating user rating: raterId={}, ratedUserId={}, type={}, rating={}", 
-                   raterId, ratedUserId, ratingType, ratingValue);
-        
-        // Validate inputs
-        validateRatingInput(ratingValue);
-        
-        if (raterId.equals(ratedUserId)) {
-            throw new ValidationException("Users cannot rate themselves");
-        }
-        
-        if (!ratingType.affectsTrustScore()) {
-            throw new ValidationException("Invalid rating type for user rating. Use USER_TO_USER, OWNER_TO_BORROWER, or BORROWER_TO_OWNER");
-        }
-        // Validate booking if provided (Issue #26)
-        validateBookingForRating(bookingId, raterId);
-
-        
-        // Get user entities (verify they exist)
-        getUserById(raterId);
-        getUserById(ratedUserId);
-        
-        // Check for duplicate rating for this type
-        Optional<Rating> existingRating = ratingRepository.findByRaterIdAndRateeIdAndRatingType(
-            raterId, ratedUserId, ratingType);
-        if (existingRating.isPresent()) {
-            throw new ValidationException("User has already submitted this type of rating for this user. Use updateRating instead.");
-        }
-        
-        // Create rating
-        Rating newRating = new Rating();
-        newRating.setRaterId(raterId);
-        newRating.setRateeId(ratedUserId);
-        newRating.setRatingType(ratingType);
-        newRating.setRatingValue(ratingValue);
-        newRating.setComment(sanitizeComment(comment));
-        newRating.setBookingId(bookingId); // This also sets isVerified if bookingId present
-        
-        // Save rating
-        Rating savedRating = ratingRepository.save(newRating);
-        
-        // Update user trust score
-        updateUserTrustScore(ratedUserId);
-        
-        // Mark booking as rated (Issue #26)
-        markBookingAsRated(bookingId);
-        
-        logger.info("Successfully created user rating with ID: {}", savedRating.getId());
-        return savedRating;
-    }
-    
-    /**
-     * Update an existing rating.
-     * 
-     * @param ratingId ID of the rating to update
-     * @param raterId ID of the user updating the rating (for authorization)
-     * @param newRatingValue New rating value (1-5)
-     * @param newComment New comment
-     * @return The updated Rating object
-     */
-    public Rating updateRating(String ratingId, String raterId, Integer newRatingValue, String newComment) {
-        logger.info("Updating rating: ratingId={}, raterId={}, newRating={}", 
-                   ratingId, raterId, newRatingValue);
-        
-        // Validate inputs
-        validateRatingInput(newRatingValue);
-        
-        // Get existing rating
-        Rating existingRating = getRatingById(ratingId);
-        
-        // Check authorization - only the original rater can update
-        if (!existingRating.getRaterId().equals(raterId)) {
-            throw new ValidationException("Only the original rater can update this rating");
-        }
-        
-        // Check if rating is still editable (within time window)
-        if (isRatingTooOldToEdit(existingRating)) {
-            throw new ValidationException(String.format(
-                "Rating is too old to be edited. Ratings can only be edited within %d days of creation.",
-                RATING_EDIT_WINDOW_DAYS));
-        }
-        
-        // Update rating
-        existingRating.setRatingValue(newRatingValue);
-        existingRating.setComment(sanitizeComment(newComment));
-        
-        // Save updated rating
-        Rating updatedRating = ratingRepository.save(existingRating);
-        
-        // Update derived metrics
-        if (existingRating.getRatingType().affectsItemQuality()) {
-            updateItemAverageRating(existingRating.getItemId());
-        }
-        if (existingRating.getRatingType().affectsTrustScore()) {
-            updateUserTrustScore(existingRating.getRateeId());
-        }
-        
-        logger.info("Successfully updated rating with ID: {}", updatedRating.getId());
-        return updatedRating;
-    }
-    
-    /**
-     * Get all ratings for a specific item.
-     * 
-     * @param itemId ID of the item
-     * @return List of ratings for the item
-     */
-    @Transactional(readOnly = true)
-    public List<Rating> getItemRatings(String itemId) {
-        logger.debug("Fetching ratings for item: {}", itemId);
-        
-        // Verify item exists
-        getItemById(itemId);
-        
-        return ratingRepository.findByItemIdOrderByCreatedDateDesc(itemId);
-    }
-    
-    /**
-     * Get all ratings given by a specific user.
-     * 
-     * @param raterId ID of the rater
-     * @return List of ratings given by the user
-     */
-    @Transactional(readOnly = true)
-    public List<Rating> getRatingsByRater(String raterId) {
-        logger.debug("Fetching ratings by rater: {}", raterId);
-        
-        // Verify user exists
-        getUserById(raterId);
-        
-        return ratingRepository.findByRaterIdOrderByCreatedDateDesc(raterId);
-    }
-    
-    /**
-     * Get all ratings received by a specific user.
-     * 
-     * @param userId ID of the user
-     * @return List of ratings received by the user
-     */
-    @Transactional(readOnly = true)
-    public List<Rating> getRatingsReceivedByUser(String userId) {
-        logger.debug("Fetching ratings received by user: {}", userId);
-        
-        // Verify user exists
-        getUserById(userId);
-        
-        return ratingRepository.findByRateeIdOrderByCreatedDateDesc(userId);
-    }
-    
-    /**
-     * Get average rating for a specific item.
-     * 
-     * @param itemId ID of the item
-     * @return Average rating (0.0 if no ratings)
-     */
-    @Transactional(readOnly = true)
-    public Double getItemAverageRating(String itemId) {
-        logger.debug("Calculating average rating for item: {}", itemId);
-        
-        List<Rating> ratings = ratingRepository.findByItemId(itemId);
-        
-        if (ratings.isEmpty()) {
-            return 0.0;
-        }
-        
-        double average = ratings.stream()
-                .mapToDouble(Rating::getRatingValue)
-                .average()
-                .orElse(0.0);
-        
-        return Math.round(average * 10.0) / 10.0; // Round to 1 decimal place
-    }
-    
-    /**
-     * Get trust score for a specific user.
-     * 
-     * @param userId ID of the user
-     * @return Trust score calculated using TrustScoreCalculator
-     */
-    @Transactional(readOnly = true)
-    public Double getUserTrustScore(String userId) {
-        logger.debug("Calculating trust score for user: {}", userId);
-        
-        // Verify user exists
-        getUserById(userId);
-        
-        // Get all user ratings (not item ratings)
-        List<Rating> userRatings = ratingRepository.findUserRatingsForTrustScore(userId);
-        
-        return trustScoreCalculator.calculateTrustScore(userRatings);
-    }
-    
-    /**
-     * Get rating statistics for an item.
-     * 
-     * @param itemId ID of the item
-     * @return RatingStatistics object with detailed rating breakdown
-     */
-    @Transactional(readOnly = true)
-    public RatingStatistics getItemRatingStatistics(String itemId) {
-        logger.debug("Fetching rating statistics for item: {}", itemId);
-        
-        List<Rating> ratings = ratingRepository.findByItemId(itemId);
-        
-        return calculateRatingStatistics(ratings);
-    }
-    
-    /**
-     * Get rating statistics for a user.
-     * 
-     * @param userId ID of the user
-     * @return RatingStatistics object with detailed rating breakdown
-     */
-    @Transactional(readOnly = true)
-    public RatingStatistics getUserRatingStatistics(String userId) {
-        logger.debug("Fetching rating statistics for user: {}", userId);
-        
-        List<Rating> ratings = ratingRepository.findByRateeIdOrderByCreatedDateDesc(userId);
-        
-        return calculateRatingStatistics(ratings);
-    }
-    
-    /**
-     * Get a specific rating by ID.
-     * 
-     * @param ratingId ID of the rating
-     * @return Rating object
-     */
-    @Transactional(readOnly = true)
-    public Rating getRatingById(String ratingId) {
-        return ratingRepository.findById(ratingId)
-                .orElseThrow(() -> new RatingNotFoundException(ratingId));
-    }
-    
-    /**
-     * Delete a rating.
-     * Only the original rater can delete their rating.
-     * 
-     * @param ratingId ID of the rating to delete
-     * @param userId ID of the user requesting deletion (for authorization)
-     */
-    public void deleteRating(String ratingId, String userId) {
-        logger.info("Deleting rating: ratingId={}, userId={}", ratingId, userId);
-        
-        Rating rating = getRatingById(ratingId);
-        
-        // Check authorization - only the rater can delete
-        if (!rating.getRaterId().equals(userId)) {
-            throw new ValidationException("Only the original rater can delete this rating");
-        }
-        
-        // Delete rating
-        ratingRepository.delete(rating);
-        
-        // Update derived metrics
-        if (rating.getRatingType().affectsItemQuality() && rating.getItemId() != null) {
-            updateItemAverageRating(rating.getItemId());
-        }
-        if (rating.getRatingType().affectsTrustScore()) {
-            updateUserTrustScore(rating.getRateeId());
-        }
-        
-        logger.info("Successfully deleted rating with ID: {}", ratingId);
-    }
-    
-    // Private helper methods
-    
-    private void validateRatingInput(Integer rating) {
-        if (rating == null) {
-            throw new ValidationException("Rating cannot be null");
-        }
-        if (rating < 1 || rating > 5) {
-            throw new ValidationException("Rating must be between 1 and 5");
-        }
-    }
-    
-    private User getUserById(String userId) {
-        return userRepository.findById(userId)
-                .orElseThrow(() -> new ResourceNotFoundException("User", userId));
-    }
-    
-    private Item getItemById(String itemId) {
-        return itemRepository.findById(itemId)
-                .orElseThrow(() -> new ResourceNotFoundException("Item", itemId));
-    }
-    
-    private String sanitizeComment(String comment) {
-        if (comment == null) {
-            return null;
-        }
-        
-        // Trim whitespace
-        comment = comment.trim();
-        
-        // Return null if empty
-        if (comment.isEmpty()) {
-            return null;
-        }
-        
-        // Limit length (enforced by validation, but double-check)
-        if (comment.length() > 1000) {
-            comment = comment.substring(0, 997) + "...";
-        }
-        
-        // Basic sanitization - remove potentially dangerous characters
-        comment = comment.replaceAll("[<>\"']", "");
-        
-        return comment;
-    }
-    
-    private boolean isRatingTooOldToEdit(Rating rating) {
-        // Allow editing within RATING_EDIT_WINDOW_DAYS of creation
-        LocalDateTime cutoff = rating.getCreatedDate().plusDays(RATING_EDIT_WINDOW_DAYS);
-        return LocalDateTime.now().isAfter(cutoff);
-    }
-    
-    private void updateUserTrustScore(String userId) {
-        try {
-            Double trustScore = getUserTrustScore(userId);
-            
-            // Update user entity with new trust score
-            User user = getUserById(userId);
-            user.setTrustScore(trustScore);
-            userRepository.save(user);
-            
-            logger.debug("Updated trust score for user {}: {}", userId, trustScore);
-        } catch (Exception e) {
-            logger.error("Error updating trust score for user {}: {}", userId, e.getMessage());
-        }
-    }
-    
-    private void updateItemAverageRating(String itemId) {
-        try {
-            Double averageRating = getItemAverageRating(itemId);
-            
-            // Update item entity with new average rating if it has that field
-            // Note: Our Item entity may not have averageRating field yet
-            // This is a placeholder for future enhancement
-            logger.debug("Calculated average rating for item {}: {}", itemId, averageRating);
-        } catch (Exception e) {
-            logger.error("Error calculating average rating for item {}: {}", itemId, e.getMessage());
-        }
-    }
-    
-    private RatingStatistics calculateRatingStatistics(List<Rating> ratings) {
-        if (ratings.isEmpty()) {
-            return new RatingStatistics(0, 0.0, new int[]{0, 0, 0, 0, 0});
-        }
-        
-        int totalRatings = ratings.size();
-        double averageRating = ratings.stream()
-                .mapToDouble(Rating::getRatingValue)
-                .average()
-                .orElse(0.0);
-        
-        int[] ratingDistribution = new int[5]; // Index 0 = 1-star, Index 4 = 5-star
-        
-        ratings.forEach(rating -> {
-            int ratingValue = rating.getRatingValue();
-            if (ratingValue >= 1 && ratingValue <= 5) {
-                ratingDistribution[ratingValue - 1]++;
-            }
-        });
-        
-        return new RatingStatistics(totalRatings, averageRating, ratingDistribution);
-    }
-    
-    /**
-     * Inner class for rating statistics.
-     */
-    public static class RatingStatistics {
-        private final int totalRatings;
-        private final double averageRating;
-        private final int[] ratingDistribution; // [1-star count, 2-star count, ..., 5-star count]
-        
-        public RatingStatistics(int totalRatings, double averageRating, int[] ratingDistribution) {
-            this.totalRatings = totalRatings;
-            this.averageRating = Math.round(averageRating * 10.0) / 10.0;
-            this.ratingDistribution = ratingDistribution.clone();
-        }
-        
-        // Getters
-        public int getTotalRatings() { return totalRatings; }
-        public double getAverageRating() { return averageRating; }
-        public int[] getRatingDistribution() { return ratingDistribution.clone(); }
-        public int getOneStarCount() { return ratingDistribution[0]; }
-        public int getTwoStarCount() { return ratingDistribution[1]; }
-        public int getThreeStarCount() { return ratingDistribution[2]; }
-        public int getFourStarCount() { return ratingDistribution[3]; }
-        public int getFiveStarCount() { return ratingDistribution[4]; }
-        
-        public double getPercentageForRating(int rating) {
-            if (rating < 1 || rating > 5 || totalRatings == 0) {
-                return 0.0;
-            }
-            return Math.round((double) ratingDistribution[rating - 1] / totalRatings * 1000.0) / 10.0;
-        }
-    }
-
-    // ===== Issue #26: Booking-Rating Integration Methods =====
-    
-    private void validateBookingForRating(String bookingId, String raterId) {
-        if (bookingId == null || bookingId.trim().isEmpty()) return;
-        Booking booking = bookingRepository.findById(bookingId)
-                .orElseThrow(() -> new ResourceNotFoundException("Booking", bookingId));
-        if (booking.getStatus() != BookingStatus.COMPLETED) {
-            throw new ValidationException("Cannot rate - booking not completed. Status: " + booking.getStatus());
-        }
-        if (!booking.getBorrowerId().equals(raterId)) {
-            throw new ValidationException("Only the borrower can rate this booking");
-        }
-        if (Boolean.TRUE.equals(booking.getIsRated())) {
-            throw new ValidationException("This booking has already been rated");
-        }
-    }
-    
-    @Transactional(readOnly = true)
-    public boolean canRateBooking(String bookingId, String userId) {
-        try {
-            Booking booking = bookingRepository.findById(bookingId).orElse(null);
-            return booking != null && booking.getStatus() == BookingStatus.COMPLETED 
-                   && booking.getBorrowerId().equals(userId) 
-                   && !Boolean.TRUE.equals(booking.getIsRated());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-    
-    private void markBookingAsRated(String bookingId) {
-        if (bookingId == null || bookingId.trim().isEmpty()) return;
-        try {
-            Booking booking = bookingRepository.findById(bookingId).orElse(null);
-            if (booking != null) {
-                booking.setIsRated(true);
-                bookingRepository.save(booking);
-            }
-        } catch (Exception e) {
-            logger.error("Error marking booking as rated: {}", e.getMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/backend/src/main/java/com/locallend/locallend/service/UserQueryService.java b/backend/src/main/java/com/locallend/locallend/service/UserQueryService.java
deleted file mode 100644
index f7768b3d15fc0f03ec238e8a1ce3a810a65eec89..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/UserQueryService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.repository.UserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Read-heavy query service for user search and retrieval operations.
- * Separates read operations from write operations in UserService.
- */
-@Service
-public class UserQueryService {
-    private final UserRepository userRepository;
-
-    @Autowired
-    public UserQueryService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Find user by username or email.
-     * @param usernameOrEmail Username or email to search
-     * @return Optional containing user if found
-     */
-    public Optional<User> findByUsernameOrEmail(String usernameOrEmail) {
-        return userRepository.findByUsernameOrEmail(usernameOrEmail);
-    }
-
-    /**
-     * List active users with pagination and sorting.
-     * @param page Page number (0-indexed)
-     * @param size Page size
-     * @param sort Sort criteria
-     * @return Page of active users
-     */
-    public Page<User> listActiveUsers(int page, int size, Sort sort) {
-        Pageable pageable = PageRequest.of(page, size, sort);
-        return userRepository.findByIsActiveTrue(pageable);
-    }
-
-    /**
-     * Get top-rated active users.
-     * @param limit Maximum number of users to return
-     * @return List of top-rated users
-     */
-    public List<User> topRatedActiveUsers(int limit) {
-        Pageable pageable = PageRequest.of(0, limit, Sort.by(Sort.Direction.DESC, "trustScore"));
-        Page<User> page = new PageImpl<>(userRepository.findTopRatedActiveUsers(pageable));
-        return page.getContent();
-    }
-
-    /**
-     * Search active users by name or username.
-     * @param term Search term (case-insensitive regex)
-     * @return List of matching users
-     */
-    public List<User> searchActiveUsers(String term) {
-        return userRepository.searchActiveUsersByNameOrUsername(term);
-    }
-
-    /**
-     * Search active users by name or username with pagination.
-     * @param term Search term (case-insensitive regex)
-     * @param page Page number (0-indexed)
-     * @param size Page size
-     * @return Page of matching users
-     */
-    public Page<User> searchActiveUsers(String term, int page, int size) {
-        List<User> results = userRepository.searchActiveUsersByNameOrUsername(term);
-        Pageable pageable = PageRequest.of(page, size);
-        
-        int start = (int) pageable.getOffset();
-        int end = Math.min((start + pageable.getPageSize()), results.size());
-        
-        List<User> pageContent = results.subList(start, end);
-        return new PageImpl<>(pageContent, pageable, results.size());
-    }
-
-    /**
-     * Find user by ID.
-     * @param userId User ID
-     * @return Optional containing user if found
-     */
-    public Optional<User> findById(String userId) {
-        return userRepository.findById(userId);
-    }
-}
-
diff --git a/backend/src/main/java/com/locallend/locallend/service/UserService.java b/backend/src/main/java/com/locallend/locallend/service/UserService.java
deleted file mode 100644
index 809f5b8e2723fcd5ad6858089203913c791df5ec..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/UserService.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.locallend.locallend.service;
-
-import com.locallend.locallend.dto.request.UserRegistrationDto;
-import com.locallend.locallend.exception.BusinessException;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.repository.UserRepository;
-import com.locallend.locallend.service.dto.UserStatsDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.Optional;
-
-/**
- * Main service for user-related business logic.
- * Handles registration, authentication, profile management, and trust score updates.
- */
-@Service
-@Transactional
-public class UserService {
-    private final UserRepository userRepository;
-    private final PasswordService passwordService;
-
-    @Autowired
-    public UserService(UserRepository userRepository, PasswordService passwordService) {
-        this.userRepository = userRepository;
-        this.passwordService = passwordService;
-    }
-
-    /**
-     * Register a new user.
-     * @param dto User registration data
-     * @return Created user
-     * @throws BusinessException if username or email already exists
-     */
-    public User registerUser(UserRegistrationDto dto) {
-        // Check for duplicate username
-        userRepository.findByUsername(dto.getUsername())
-                .ifPresent(u -> { throw new BusinessException("Username already exists"); });
-
-        // Check for duplicate email
-        userRepository.findByEmail(dto.getEmail())
-                .ifPresent(u -> { throw new BusinessException("Email already exists"); });
-
-        // Create new user with hashed password
-        User user = new User(dto.getUsername(), dto.getName(), dto.getEmail(),
-                passwordService.hash(dto.getPassword()));
-        user.setCreatedDate(LocalDateTime.now());
-        user.setIsActive(true);
-        user.setRole("USER");
-        user.setTrustScore(5.0);  // Default trust score
-
-        if (dto.getPhoneNumber() != null) {
-            user.setPhoneNumber(dto.getPhoneNumber());
-        }
-
-        return userRepository.save(user);
-    }
-
-    /**
-     * Verify user credentials for authentication.
-     * @param usernameOrEmail Username or email
-     * @param rawPassword Plain text password
-     * @return Authenticated user
-     * @throws BusinessException if credentials are invalid or user is inactive
-     */
-    public User verifyCredentials(String usernameOrEmail, String rawPassword) {
-        User user = userRepository.findByUsernameOrEmail(usernameOrEmail)
-                .orElseThrow(() -> new BusinessException("Invalid credentials"));
-
-        if (Boolean.FALSE.equals(user.getIsActive())) {
-            throw new BusinessException("User account is inactive");
-        }
-
-        if (!passwordService.matches(rawPassword, user.getPassword())) {
-            throw new BusinessException("Invalid credentials");
-        }
-
-        return user;
-    }
-
-    /**
-     * Update user profile information.
-     * @param userId User ID
-     * @param name New name (optional)
-     * @param phoneNumber New phone number (optional)
-     * @param profileImageUrl New profile image URL (optional)
-     * @return Updated user
-     * @throws BusinessException if user not found
-     */
-    public User updateProfile(String userId, String name, String phoneNumber, String profileImageUrl) {
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new BusinessException("User not found"));
-
-        if (name != null && !name.isBlank()) {
-            user.setName(name);
-        }
-        if (phoneNumber != null && !phoneNumber.isBlank()) {
-            user.setPhoneNumber(phoneNumber);
-        }
-        if (profileImageUrl != null && !profileImageUrl.isBlank()) {
-            user.setProfileImageUrl(profileImageUrl);
-        }
-
-        return userRepository.save(user);
-    }
-
-    /**
-     * Update user trust score.
-     * @param userId User ID
-     * @param newTrustScore New trust score (0.0 - 5.0)
-     * @throws BusinessException if trust score is out of bounds or user not found
-     */
-    public void updateTrustScore(String userId, double newTrustScore) {
-        if (newTrustScore < 0.0 || newTrustScore > 5.0) {
-            throw new BusinessException("Trust score must be between 0.0 and 5.0");
-        }
-
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new BusinessException("User not found"));
-        
-        user.setTrustScore(newTrustScore);
-        userRepository.save(user);
-    }
-
-    /**
-     * Activate or deactivate a user account.
-     * @param userId User ID
-     * @param active true to activate, false to deactivate
-     * @throws BusinessException if user not found
-     */
-    public void setActive(String userId, boolean active) {
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new BusinessException("User not found"));
-        
-        user.setIsActive(active);
-        userRepository.save(user);
-    }
-
-    /**
-     * Get aggregate user statistics.
-     * @return User statistics DTO
-     */
-    public UserStatsDto getUserStats() {
-        long total = userRepository.count();
-        long active = Optional.ofNullable(userRepository.countByIsActiveTrue()).orElse(0L);
-        // TODO: Use MongoDB aggregation pipeline for true average trust score
-        double avg = 0.0;
-        return new UserStatsDto(total, active, avg);
-    }
-
-    /**
-     * Get user by ID.
-     * @param userId User ID
-     * @return User if found
-     * @throws BusinessException if user not found
-     */
-    public User getUserById(String userId) {
-        return userRepository.findById(userId)
-                .orElseThrow(() -> new BusinessException("User not found"));
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/service/dto/UserStatsDto.java b/backend/src/main/java/com/locallend/locallend/service/dto/UserStatsDto.java
deleted file mode 100644
index c3b4cc271e2f531adf56d4225a70e10410e3568a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/service/dto/UserStatsDto.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.locallend.locallend.service.dto;
-
-/**
- * DTO for delivering user statistics.
- * Contains aggregate counts and averages.
- */
-public class UserStatsDto {
-    private long totalUsers;
-    private long activeUsers;
-    private double averageTrustScore;
-
-    public UserStatsDto() {}
-
-    public UserStatsDto(long totalUsers, long activeUsers, double averageTrustScore) {
-        this.totalUsers = totalUsers;
-        this.activeUsers = activeUsers;
-        this.averageTrustScore = averageTrustScore;
-    }
-
-    // Getters and Setters
-    public long getTotalUsers() {
-        return totalUsers;
-    }
-
-    public void setTotalUsers(long totalUsers) {
-        this.totalUsers = totalUsers;
-    }
-
-    public long getActiveUsers() {
-        return activeUsers;
-    }
-
-    public void setActiveUsers(long activeUsers) {
-        this.activeUsers = activeUsers;
-    }
-
-    public double getAverageTrustScore() {
-        return averageTrustScore;
-    }
-
-    public void setAverageTrustScore(double averageTrustScore) {
-        this.averageTrustScore = averageTrustScore;
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/BookingFactory.java b/backend/src/main/java/com/locallend/locallend/util/BookingFactory.java
deleted file mode 100644
index fbe7b0f9692ee7bc3211f2f66473408d36be1805..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/BookingFactory.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.model.enums.BookingStatus;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-
-/**
- * Factory class for creating Booking objects with proper validation and business rules.
- */
-@Component
-public class BookingFactory {
-
-    public Booking createBookingRequest(Item item, User borrower, User owner,
-                                        LocalDateTime startDate, LocalDateTime endDate,
-                                        String bookingNotes) {
-        validateBookingParameters(item, borrower, owner, startDate, endDate);
-        Booking booking = new Booking(item, borrower, owner, startDate, endDate);
-        booking.setBookingNotes(bookingNotes);
-        booking.setStatus(BookingStatus.PENDING);
-        if (item.getDeposit() > 0) {
-            booking.setDepositAmount(item.getDeposit());
-        }
-        booking.calculateDuration();
-        return booking;
-    }
-
-    public Booking createBookingRequestWithDeposit(Item item, User borrower, User owner,
-                                                   LocalDateTime startDate, LocalDateTime endDate,
-                                                   String bookingNotes, Double customDepositAmount) {
-        Booking booking = createBookingRequest(item, borrower, owner, startDate, endDate, bookingNotes);
-        if (customDepositAmount != null && customDepositAmount >= 0) {
-            booking.setDepositAmount(customDepositAmount);
-        }
-        return booking;
-    }
-
-    public Booking createImmediateBooking(Item item, User borrower, User owner, Integer durationDays) {
-        if (durationDays == null || durationDays < 1) {
-            throw new IllegalArgumentException("Duration must be at least 1 day");
-        }
-        LocalDateTime startDate = LocalDateTime.now().plusHours(1);
-        LocalDateTime endDate = startDate.plusDays(durationDays);
-        return createBookingRequest(item, borrower, owner, startDate, endDate, "Immediate booking");
-    }
-
-    public Booking createRescheduledBooking(Booking originalBooking, LocalDateTime newStartDate,
-                                            LocalDateTime newEndDate, String reason) {
-        validateBookingParameters(originalBooking.getItem(), originalBooking.getBorrower(),
-                originalBooking.getOwner(), newStartDate, newEndDate);
-        Booking rescheduled = new Booking(originalBooking.getItem(), originalBooking.getBorrower(),
-                originalBooking.getOwner(), newStartDate, newEndDate);
-        rescheduled.setDepositAmount(originalBooking.getDepositAmount());
-        rescheduled.setDepositPaid(originalBooking.getDepositPaid());
-        String notes = originalBooking.getBookingNotes() != null ? originalBooking.getBookingNotes() + " " : "";
-        rescheduled.setBookingNotes(notes + "[RESCHEDULED: " + reason + "]");
-        rescheduled.calculateDuration();
-        return rescheduled;
-    }
-
-    public Booking createTestBooking(String itemId, String borrowerId, String ownerId,
-                                     BookingStatus status, LocalDateTime startDate,
-                                     LocalDateTime endDate) {
-        Booking booking = new Booking();
-        booking.setItemId(itemId);
-        booking.setBorrowerId(borrowerId);
-        booking.setOwnerId(ownerId);
-        booking.setStatus(status);
-        booking.setStartDate(startDate);
-        booking.setEndDate(endDate);
-        booking.setBookingNotes("Test booking created by BookingFactory");
-        booking.calculateDuration();
-        return booking;
-    }
-
-    public Booking createValidatedBooking(Item item, User borrower, User owner,
-                                          LocalDateTime startDate, LocalDateTime endDate,
-                                          String bookingNotes) {
-        validateBookingParameters(item, borrower, owner, startDate, endDate);
-        validateBusinessRules(item, borrower, owner);
-        return createBookingRequest(item, borrower, owner, startDate, endDate, bookingNotes);
-    }
-
-    private void validateBookingParameters(Item item, User borrower, User owner,
-                                           LocalDateTime startDate, LocalDateTime endDate) {
-        if (item == null) throw new IllegalArgumentException("Item cannot be null");
-        if (borrower == null) throw new IllegalArgumentException("Borrower cannot be null");
-        if (owner == null) throw new IllegalArgumentException("Owner cannot be null");
-        if (startDate == null) throw new IllegalArgumentException("Start date cannot be null");
-        if (endDate == null) throw new IllegalArgumentException("End date cannot be null");
-        if (startDate.isAfter(endDate)) throw new IllegalArgumentException("Start date cannot be after end date");
-        if (startDate.isBefore(LocalDateTime.now().minusHours(1))) {
-            throw new IllegalArgumentException("Start date cannot be in the past");
-        }
-    }
-
-    private void validateBusinessRules(Item item, User borrower, User owner) {
-        if (borrower.getId() != null && borrower.getId().equals(owner.getId())) {
-            throw new IllegalArgumentException("User cannot borrow their own item");
-        }
-        if (!item.canBeBorrowed()) {
-            throw new IllegalArgumentException("Item is not available for borrowing");
-        }
-        if (borrower.getTrustScore() < 0.5) {
-            throw new IllegalArgumentException("Borrower trust score too low for booking");
-        }
-    }
-
-    public Booking createFromRequest(Item item, User borrower, User owner,
-                                     LocalDateTime startDate, LocalDateTime endDate,
-                                     String notes, Double depositAmount) {
-        if (depositAmount != null && depositAmount >= 0) {
-            return createBookingRequestWithDeposit(item, borrower, owner, startDate, endDate, notes, depositAmount);
-        }
-        return createBookingRequest(item, borrower, owner, startDate, endDate, notes);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/BookingMapper.java b/backend/src/main/java/com/locallend/locallend/util/BookingMapper.java
deleted file mode 100644
index 26418a0a368995bbec5e2b14f08e3829a0a1a356..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/BookingMapper.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.dto.response.BookingResponseDto;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Utility class for mapping between Booking entities and DTOs.
- */
-@Component
-public class BookingMapper {
-
-    public BookingResponseDto toBookingResponseDto(Booking booking) {
-        if (booking == null) return null;
-
-        BookingResponseDto dto = new BookingResponseDto();
-        dto.setId(booking.getId());
-        dto.setItemId(booking.getItemId());
-        dto.setBorrowerId(booking.getBorrowerId());
-        dto.setOwnerId(booking.getOwnerId());
-        dto.setStatus(booking.getStatus());
-        dto.setStartDate(booking.getStartDate());
-        dto.setEndDate(booking.getEndDate());
-        dto.setActualStartDate(booking.getActualStartDate());
-        dto.setActualEndDate(booking.getActualEndDate());
-        dto.setBookingNotes(booking.getBookingNotes());
-        dto.setOwnerNotes(booking.getOwnerNotes());
-        dto.setDepositAmount(booking.getDepositAmount());
-        dto.setDepositPaid(booking.getDepositPaid());
-        dto.setCreatedDate(booking.getCreatedDate());
-        dto.setUpdatedDate(booking.getUpdatedDate());
-        dto.setConfirmedDate(booking.getConfirmedDate());
-        dto.setPickupDate(booking.getPickupDate());
-        dto.setReturnDate(booking.getReturnDate());
-        dto.setCancelledDate(booking.getCancelledDate());
-        dto.setCancellationReason(booking.getCancellationReason());
-        dto.setIsRated(booking.getIsRated());
-        dto.setDurationDays(booking.getDurationDays());
-
-        if (booking.getItem() != null) {
-            dto.setItemName(booking.getItem().getName());
-            if (booking.getItem().getImages() != null && !booking.getItem().getImages().isEmpty()) {
-                dto.setItemImageUrl(booking.getItem().getImages().get(0));
-            }
-        }
-        if (booking.getBorrower() != null) {
-            dto.setBorrowerName(booking.getBorrower().getName());
-        }
-        if (booking.getOwner() != null) {
-            dto.setOwnerName(booking.getOwner().getName());
-        }
-
-        dto.setStatusDescription(booking.getStatus() != null ? booking.getStatus().getDescription() : null);
-        dto.setTimeAgo(calculateTimeAgo(booking.getCreatedDate()));
-        dto.setDaysUntilStart(booking.getDaysUntilStart());
-        dto.setDaysUntilEnd(booking.getDaysUntilEnd());
-        dto.setCanBeCancelled(booking.getStatus() != null && booking.getStatus().canBeCancelled());
-        dto.setCanBeConfirmed(booking.getStatus() != null && booking.getStatus().canBeConfirmed());
-        dto.setCanBeActivated(booking.getStatus() != null && booking.getStatus().canBeActivated());
-        dto.setCanBeCompleted(booking.getStatus() != null && booking.getStatus().canBeCompleted());
-        dto.setIsOverdue(booking.isOverdue());
-        dto.setRequiresDeposit(booking.requiresDeposit());
-
-        return dto;
-    }
-
-    public List<BookingResponseDto> toBookingResponseDtoList(List<Booking> bookings) {
-        if (bookings == null) return null;
-        return bookings.stream().map(this::toBookingResponseDto).collect(Collectors.toList());
-    }
-
-    public BookingResponseDto toBookingSummaryDto(Booking booking) {
-        if (booking == null) return null;
-        BookingResponseDto dto = new BookingResponseDto();
-        dto.setId(booking.getId());
-        dto.setItemId(booking.getItemId());
-        dto.setBorrowerId(booking.getBorrowerId());
-        dto.setOwnerId(booking.getOwnerId());
-        dto.setStatus(booking.getStatus());
-        dto.setStartDate(booking.getStartDate());
-        dto.setEndDate(booking.getEndDate());
-        dto.setDepositAmount(booking.getDepositAmount());
-        dto.setCreatedDate(booking.getCreatedDate());
-        dto.setDurationDays(booking.getDurationDays());
-        if (booking.getItem() != null) dto.setItemName(booking.getItem().getName());
-        if (booking.getBorrower() != null) dto.setBorrowerName(booking.getBorrower().getName());
-        if (booking.getOwner() != null) dto.setOwnerName(booking.getOwner().getName());
-        dto.setStatusDescription(booking.getStatus() != null ? booking.getStatus().getDescription() : null);
-        dto.setTimeAgo(calculateTimeAgo(booking.getCreatedDate()));
-        dto.setIsOverdue(booking.isOverdue());
-        return dto;
-    }
-
-    public List<BookingResponseDto> toBookingSummaryDtoList(List<Booking> bookings) {
-        if (bookings == null) return null;
-        return bookings.stream().map(this::toBookingSummaryDto).collect(Collectors.toList());
-    }
-
-    private String calculateTimeAgo(LocalDateTime dateTime) {
-        if (dateTime == null) return null;
-        LocalDateTime now = LocalDateTime.now();
-        long minutes = ChronoUnit.MINUTES.between(dateTime, now);
-        long hours = ChronoUnit.HOURS.between(dateTime, now);
-        long days = ChronoUnit.DAYS.between(dateTime, now);
-        if (minutes < 1) return "Just now";
-        if (minutes < 60) return minutes + " minute" + (minutes == 1 ? "" : "s") + " ago";
-        if (hours < 24) return hours + " hour" + (hours == 1 ? "" : "s") + " ago";
-        if (days < 7) return days + " day" + (days == 1 ? "" : "s") + " ago";
-        if (days < 30) return (days / 7) + " week" + ((days / 7) == 1 ? "" : "s") + " ago";
-        if (days < 365) return (days / 30) + " month" + ((days / 30) == 1 ? "" : "s") + " ago";
-        return dateTime.format(DateTimeFormatter.ofPattern("MMM dd, yyyy"));
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/BookingValidator.java b/backend/src/main/java/com/locallend/locallend/util/BookingValidator.java
deleted file mode 100644
index a5c82f0d3d676db775f89ec1b60f13dd1a8504b9..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/BookingValidator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.exception.BookingConflictException;
-import com.locallend.locallend.exception.InvalidBookingPeriodException;
-import com.locallend.locallend.model.Booking;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.model.enums.ItemStatus;
-import com.locallend.locallend.repository.BookingRepository;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * Validator for booking business rules and constraints.
- */
-@Component
-public class BookingValidator {
-
-    private static final int DEFAULT_MIN_RENTAL_DAYS = 1;
-    private static final int DEFAULT_MAX_RENTAL_DAYS = 90;
-
-    /**
-     * Validate that an item is available for booking.
-     */
-    public void validateAvailability(Item item, LocalDateTime startDate, LocalDateTime endDate) {
-        if (item == null) {
-            throw new IllegalArgumentException("Item cannot be null");
-        }
-
-        if (!item.isActive()) {
-            throw new BookingConflictException("Item is not active and cannot be booked", item.getId());
-        }
-
-        if (item.getStatus() != ItemStatus.AVAILABLE) {
-            throw new BookingConflictException("Item is not available for booking (status: " + item.getStatus() + ")", item.getId());
-        }
-
-        validateBookingPeriod(startDate, endDate);
-    }
-
-    /**
-     * Validate booking period against date constraints.
-     */
-    public void validateBookingPeriod(LocalDateTime startDate, LocalDateTime endDate) {
-        if (startDate == null || endDate == null) {
-            throw new IllegalArgumentException("Start date and end date are required");
-        }
-
-        if (!endDate.isAfter(startDate)) {
-            throw new InvalidBookingPeriodException("End date must be after start date");
-        }
-
-        if (startDate.isBefore(LocalDateTime.now().minusHours(1))) {
-            throw new InvalidBookingPeriodException("Start date cannot be in the past");
-        }
-
-        long days = DateTimeUtil.calculateDaysBetween(startDate, endDate);
-        
-        // For now use defaults; Item model can be enhanced later with min/max rental days
-        if (days < DEFAULT_MIN_RENTAL_DAYS) {
-            throw new InvalidBookingPeriodException(
-                "Booking period too short. Minimum " + DEFAULT_MIN_RENTAL_DAYS + " day(s) required",
-                DEFAULT_MIN_RENTAL_DAYS, DEFAULT_MAX_RENTAL_DAYS, days
-            );
-        }
-
-        if (days > DEFAULT_MAX_RENTAL_DAYS) {
-            throw new InvalidBookingPeriodException(
-                "Booking period too long. Maximum " + DEFAULT_MAX_RENTAL_DAYS + " day(s) allowed",
-                DEFAULT_MIN_RENTAL_DAYS, DEFAULT_MAX_RENTAL_DAYS, days
-            );
-        }
-    }
-
-    /**
-     * Validate no conflicting bookings exist for the item in the date range.
-     */
-    public void validateNoConflicts(String itemId, LocalDateTime startDate, LocalDateTime endDate,
-                                    BookingRepository repository) {
-        if (itemId == null) {
-            throw new IllegalArgumentException("Item ID cannot be null");
-        }
-
-        List<Booking> conflicts = repository.findConflictingBookings(itemId, startDate, endDate);
-        
-        if (!conflicts.isEmpty()) {
-            Booking conflict = conflicts.get(0);
-            throw new BookingConflictException(
-                "Item already booked for selected dates. Conflict with booking " + conflict.getId(),
-                itemId,
-                conflict.getId()
-            );
-        }
-    }
-
-    /**
-     * Validate that user can borrow item (not their own).
-     */
-    public void validateBorrowerEligibility(User borrower, User owner) {
-        if (borrower == null || owner == null) {
-            throw new IllegalArgumentException("Borrower and owner cannot be null");
-        }
-
-        if (borrower.getId().equals(owner.getId())) {
-            throw new IllegalArgumentException("User cannot borrow their own item");
-        }
-
-        // Trust score validation
-        if (borrower.getTrustScore() < 0.3) {
-            throw new IllegalArgumentException("Borrower trust score too low for booking (minimum 0.3 required)");
-        }
-    }
-
-    /**
-     * Validate that a booking can transition to a new status.
-     */
-    public void validateStatusTransition(Booking booking, com.locallend.locallend.model.enums.BookingStatus newStatus) {
-        if (booking == null || newStatus == null) {
-            throw new IllegalArgumentException("Booking and new status cannot be null");
-        }
-
-        com.locallend.locallend.model.enums.BookingStatus currentStatus = booking.getStatus();
-        
-        if (!canTransitionTo(currentStatus, newStatus)) {
-            throw new IllegalStateException(
-                "Cannot transition from " + currentStatus + " to " + newStatus
-            );
-        }
-    }
-
-    /**
-     * Check if a status transition is valid.
-     */
-    private boolean canTransitionTo(com.locallend.locallend.model.enums.BookingStatus current,
-                                   com.locallend.locallend.model.enums.BookingStatus target) {
-        return switch (current) {
-            case PENDING -> target == com.locallend.locallend.model.enums.BookingStatus.CONFIRMED 
-                         || target == com.locallend.locallend.model.enums.BookingStatus.CANCELLED
-                         || target == com.locallend.locallend.model.enums.BookingStatus.REJECTED;
-            case CONFIRMED -> target == com.locallend.locallend.model.enums.BookingStatus.ACTIVE 
-                           || target == com.locallend.locallend.model.enums.BookingStatus.CANCELLED;
-            case ACTIVE -> target == com.locallend.locallend.model.enums.BookingStatus.COMPLETED 
-                        || target == com.locallend.locallend.model.enums.BookingStatus.OVERDUE;
-            case COMPLETED, CANCELLED, REJECTED, OVERDUE -> false;
-        };
-    }
-
-    /**
-     * Validate authorization for booking operation.
-     */
-    public void validateAuthorization(Booking booking, String userId, String requiredRole) {
-        if (booking == null || userId == null) {
-            throw new IllegalArgumentException("Booking and user ID cannot be null");
-        }
-
-        switch (requiredRole.toUpperCase()) {
-            case "BORROWER":
-                if (booking.getBorrower() == null || !userId.equals(booking.getBorrower().getId())) {
-                    throw new IllegalArgumentException("Only the borrower can perform this action");
-                }
-                break;
-            case "OWNER":
-                if (booking.getOwner() == null || !userId.equals(booking.getOwner().getId())) {
-                    throw new IllegalArgumentException("Only the owner can perform this action");
-                }
-                break;
-            case "EITHER":
-                boolean isBorrower = booking.getBorrower() != null && userId.equals(booking.getBorrower().getId());
-                boolean isOwner = booking.getOwner() != null && userId.equals(booking.getOwner().getId());
-                if (!isBorrower && !isOwner) {
-                    throw new IllegalArgumentException("Only the borrower or owner can perform this action");
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid required role: " + requiredRole);
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/DateTimeUtil.java b/backend/src/main/java/com/locallend/locallend/util/DateTimeUtil.java
deleted file mode 100644
index f3540c0d9acadfefbfe4866941a4bb9109dea070..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/DateTimeUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.locallend.locallend.util;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-
-/**
- * Utility class for date/time operations related to booking management.
- */
-public class DateTimeUtil {
-
-    private DateTimeUtil() {
-        // Utility class - prevent instantiation
-    }
-
-    /**
-     * Calculate the number of days between two dates (inclusive).
-     */
-    public static long calculateDaysBetween(LocalDateTime start, LocalDateTime end) {
-        if (start == null || end == null) {
-            throw new IllegalArgumentException("Start and end dates cannot be null");
-        }
-        return ChronoUnit.DAYS.between(start.toLocalDate(), end.toLocalDate()) + 1;
-    }
-
-    /**
-     * Calculate the number of days between two LocalDate instances (inclusive).
-     */
-    public static long calculateDaysBetween(LocalDate start, LocalDate end) {
-        if (start == null || end == null) {
-            throw new IllegalArgumentException("Start and end dates cannot be null");
-        }
-        return ChronoUnit.DAYS.between(start, end) + 1;
-    }
-
-    /**
-     * Check if a date range overlaps with another date range.
-     */
-    public static boolean isOverlapping(LocalDateTime start1, LocalDateTime end1,
-                                       LocalDateTime start2, LocalDateTime end2) {
-        if (start1 == null || end1 == null || start2 == null || end2 == null) {
-            return false;
-        }
-        LocalDate s1 = start1.toLocalDate();
-        LocalDate e1 = end1.toLocalDate();
-        LocalDate s2 = start2.toLocalDate();
-        LocalDate e2 = end2.toLocalDate();
-        
-        return !s1.isAfter(e2) && !e1.isBefore(s2);
-    }
-
-    /**
-     * Check if a date range overlaps with another date range (LocalDate version).
-     */
-    public static boolean isOverlapping(LocalDate start1, LocalDate end1,
-                                       LocalDate start2, LocalDate end2) {
-        if (start1 == null || end1 == null || start2 == null || end2 == null) {
-            return false;
-        }
-        return !start1.isAfter(end2) && !end1.isBefore(start2);
-    }
-
-    /**
-     * Validate that end date is after start date.
-     */
-    public static boolean isValidDateRange(LocalDateTime start, LocalDateTime end) {
-        return start != null && end != null && end.isAfter(start);
-    }
-
-    /**
-     * Validate that end date is after start date (LocalDate version).
-     */
-    public static boolean isValidDateRange(LocalDate start, LocalDate end) {
-        return start != null && end != null && end.isAfter(start);
-    }
-
-    /**
-     * Check if a date is in the future.
-     */
-    public static boolean isFuture(LocalDateTime date) {
-        return date != null && date.isAfter(LocalDateTime.now());
-    }
-
-    /**
-     * Check if a date is in the future (LocalDate version).
-     */
-    public static boolean isFuture(LocalDate date) {
-        return date != null && date.isAfter(LocalDate.now());
-    }
-
-    /**
-     * Check if a date is in the past.
-     */
-    public static boolean isPast(LocalDateTime date) {
-        return date != null && date.isBefore(LocalDateTime.now());
-    }
-
-    /**
-     * Calculate days remaining until a date.
-     */
-    public static long daysUntil(LocalDateTime date) {
-        if (date == null) return 0;
-        return ChronoUnit.DAYS.between(LocalDateTime.now(), date);
-    }
-
-    /**
-     * Calculate days remaining until a date (LocalDate version).
-     */
-    public static long daysUntil(LocalDate date) {
-        if (date == null) return 0;
-        return ChronoUnit.DAYS.between(LocalDate.now(), date);
-    }
-
-    /**
-     * Check if a booking is overdue.
-     */
-    public static boolean isOverdue(LocalDateTime endDate) {
-        return endDate != null && LocalDateTime.now().isAfter(endDate);
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/ItemMapper.java b/backend/src/main/java/com/locallend/locallend/util/ItemMapper.java
deleted file mode 100644
index 2e7b95922ef2c88c7c5d585fb493a727a351201d..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/ItemMapper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.dto.request.ItemRequestDto;
-import com.locallend.locallend.dto.request.ItemUpdateDto;
-import com.locallend.locallend.dto.response.ItemResponseDto;
-import com.locallend.locallend.dto.response.ItemSummaryDto;
-import com.locallend.locallend.model.Category;
-import com.locallend.locallend.model.Item;
-import com.locallend.locallend.model.User;
-import com.locallend.locallend.model.enums.ItemCondition;
-import com.locallend.locallend.model.enums.ItemStatus;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class ItemMapper {
-
-    public static ItemResponseDto toResponseDto(Item item) {
-        if (item == null) return null;
-        ItemResponseDto dto = new ItemResponseDto();
-        dto.setId(item.getId());
-        dto.setName(item.getName());
-        dto.setDescription(item.getDescription());
-        dto.setCondition(item.getCondition() != null ? item.getCondition().name() : null);
-        dto.setStatus(item.getStatus() != null ? item.getStatus().name() : null);
-        dto.setDeposit(item.getDeposit());
-        dto.setImages(item.getImages());
-        dto.setAverageRating(item.getAverageRating());
-
-        User owner = item.getOwner();
-        if (owner != null) {
-            dto.setOwnerId(owner.getId());
-            dto.setOwnerName(owner.getName());
-        }
-
-        Category cat = item.getCategory();
-        if (cat != null) {
-            dto.setCategoryId(cat.getId());
-            dto.setCategoryName(cat.getName());
-        }
-
-        dto.setCanBeBorrowed(item.canBeBorrowed());
-        dto.setCreatedAt(item.getCreatedAt());
-        dto.setUpdatedAt(item.getUpdatedAt());
-        return dto;
-    }
-
-    public static ItemSummaryDto toSummaryDto(Item item) {
-        if (item == null) return null;
-        ItemSummaryDto s = new ItemSummaryDto();
-        s.setId(item.getId());
-        s.setName(item.getName());
-        s.setThumbnail(item.getImages() != null && !item.getImages().isEmpty() ? item.getImages().get(0) : null);
-        s.setCategoryName(item.getCategory() != null ? item.getCategory().getName() : null);
-        s.setOwnerName(item.getOwner() != null ? item.getOwner().getName() : null);
-        s.setStatus(item.getStatus() != null ? item.getStatus().name() : null);
-        s.setCondition(item.getCondition() != null ? item.getCondition().name() : null);
-        s.setDeposit(item.getDeposit());
-        s.setAverageRating(item.getAverageRating());
-        return s;
-    }
-
-    public static Item fromRequestDto(ItemRequestDto req, User owner, Category category) {
-        if (req == null) return null;
-        Item item = new Item();
-        item.setName(req.getName());
-        item.setDescription(req.getDescription());
-        ItemCondition cond = ItemCondition.fromString(req.getCondition());
-        if (cond != null) item.setCondition(cond);
-        item.setDeposit(req.getDeposit());
-        item.setImages(req.getImages());
-        item.setOwner(owner);
-        item.setCategory(category);
-        return item;
-    }
-
-    public static void updateFromDto(Item item, ItemUpdateDto dto) {
-        if (item == null || dto == null) return;
-        if (dto.getName() != null) item.setName(dto.getName());
-        if (dto.getDescription() != null) item.setDescription(dto.getDescription());
-        if (dto.getCondition() != null) {
-            ItemCondition cond = ItemCondition.fromString(dto.getCondition());
-            if (cond != null) item.setCondition(cond);
-        }
-        if (dto.getDeposit() != null) item.setDeposit(dto.getDeposit());
-        if (dto.getImages() != null) item.setImages(dto.getImages());
-        if (dto.getStatus() != null) {
-            ItemStatus st = ItemStatus.fromString(dto.getStatus());
-            if (st != null) item.setStatus(st);
-        }
-    }
-
-    public static List<ItemSummaryDto> toSummaryList(List<Item> items) {
-        return items == null ? List.of() : items.stream().map(ItemMapper::toSummaryDto).collect(Collectors.toList());
-    }
-
-    public static List<ItemResponseDto> toResponseList(List<Item> items) {
-        return items == null ? List.of() : items.stream().map(ItemMapper::toResponseDto).collect(Collectors.toList());
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/RatingMapper.java b/backend/src/main/java/com/locallend/locallend/util/RatingMapper.java
deleted file mode 100644
index 99ad1f5471bb751f52b0d072658e9d7bdf1c03c2..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/RatingMapper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.model.Rating;
-import com.locallend.locallend.dto.request.RatingCreateDto;
-import com.locallend.locallend.dto.response.RatingResponseDto;
-import org.springframework.stereotype.Component;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Mapper utility for converting Rating entities to/from DTOs.
- * Includes time-based calculations for "time ago" display.
- * Issue #23: Rating Entity, Repository, DTO
- */
-@Component
-public class RatingMapper {
-    
-    /**
-     * Convert RatingCreateDto to Rating entity.
-     * @param dto Rating creation request DTO
-     * @param raterId ID of the user creating the rating
-     * @return Rating entity
-     */
-    public Rating toEntity(RatingCreateDto dto, String raterId) {
-        if (dto == null) return null;
-        
-        Rating rating = new Rating();
-        rating.setRaterId(raterId);
-        rating.setRateeId(dto.getRateeId());
-        rating.setItemId(dto.getItemId());
-        rating.setBookingId(dto.getBookingId());
-        rating.setRatingType(dto.getRatingType());
-        rating.setRatingValue(dto.getRatingValue());
-        rating.setComment(dto.getComment());
-        rating.setIsAnonymous(dto.getIsAnonymous() != null ? dto.getIsAnonymous() : false);
-        rating.setIsVerified(dto.getBookingId() != null);
-        
-        return rating;
-    }
-    
-    /**
-     * Convert Rating entity to RatingResponseDto.
-     * @param rating Rating entity
-     * @return RatingResponseDto with computed fields
-     */
-    public RatingResponseDto toResponseDto(Rating rating) {
-        if (rating == null) return null;
-        
-        RatingResponseDto dto = new RatingResponseDto();
-        dto.setId(rating.getId());
-        dto.setRaterId(rating.getRaterId());
-        dto.setRateeId(rating.getRateeId());
-        dto.setItemId(rating.getItemId());
-        dto.setBookingId(rating.getBookingId());
-        dto.setRatingType(rating.getRatingType());
-        dto.setRatingValue(rating.getRatingValue());
-        dto.setComment(rating.getComment());
-        dto.setCreatedDate(rating.getCreatedDate());
-        dto.setUpdatedDate(rating.getUpdatedDate());
-        dto.setIsAnonymous(rating.getIsAnonymous());
-        dto.setHelpfulCount(rating.getHelpfulCount());
-        dto.setIsVerified(rating.getIsVerified());
-        dto.setTimeAgo(calculateTimeAgo(rating.getCreatedDate()));
-        
-        return dto;
-    }
-    
-    /**
-     * Convert list of Rating entities to list of RatingResponseDtos.
-     * @param ratings List of Rating entities
-     * @return List of RatingResponseDto
-     */
-    public List<RatingResponseDto> toResponseDtoList(List<Rating> ratings) {
-        if (ratings == null) return null;
-        return ratings.stream()
-                .map(this::toResponseDto)
-                .collect(Collectors.toList());
-    }
-    
-    /**
-     * Calculate human-readable "time ago" string from LocalDateTime.
-     * @param dateTime Past date/time
-     * @return String like "5 minutes ago", "2 hours ago", "3 days ago"
-     */
-    private String calculateTimeAgo(LocalDateTime dateTime) {
-        if (dateTime == null) return "";
-        
-        LocalDateTime now = LocalDateTime.now();
-        long minutes = ChronoUnit.MINUTES.between(dateTime, now);
-        long hours = ChronoUnit.HOURS.between(dateTime, now);
-        long days = ChronoUnit.DAYS.between(dateTime, now);
-        
-        if (minutes < 1) return "just now";
-        if (minutes < 60) return minutes + " minute" + (minutes != 1 ? "s" : "") + " ago";
-        if (hours < 24) return hours + " hour" + (hours != 1 ? "s" : "") + " ago";
-        return days + " day" + (days != 1 ? "s" : "") + " ago";
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/SecurityUtils.java b/backend/src/main/java/com/locallend/locallend/util/SecurityUtils.java
deleted file mode 100644
index d0e8aad22f55a4075435cb89a017b95d1ec26948..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/SecurityUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.exception.BusinessException;
-import com.locallend.locallend.security.MongoUserPrincipal;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * Utility class for extracting authenticated user information from SecurityContext.
- */
-public class SecurityUtils {
-
-    /**
-     * Get current authenticated user's ID from JWT token in SecurityContext.
-     * @return User ID
-     * @throws BusinessException if user is not authenticated
-     */
-    public static String getCurrentUserId() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth != null && auth.getPrincipal() instanceof MongoUserPrincipal principal) {
-            return principal.getId();
-        }
-        throw new BusinessException("User not authenticated");
-    }
-
-    /**
-     * Get current authenticated user's username from JWT token in SecurityContext.
-     * @return Username
-     * @throws BusinessException if user is not authenticated
-     */
-    public static String getCurrentUsername() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth != null && auth.getPrincipal() instanceof MongoUserPrincipal principal) {
-            return principal.getUsername();
-        }
-        throw new BusinessException("User not authenticated");
-    }
-
-    /**
-     * Get current authenticated user's principal.
-     * @return MongoUserPrincipal
-     * @throws BusinessException if user is not authenticated
-     */
-    public static MongoUserPrincipal getCurrentUser() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth != null && auth.getPrincipal() instanceof MongoUserPrincipal principal) {
-            return principal;
-        }
-        throw new BusinessException("User not authenticated");
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/TrustScoreCalculator.java b/backend/src/main/java/com/locallend/locallend/util/TrustScoreCalculator.java
deleted file mode 100644
index 9b93c8931c45e86d1c1066357f4fbf416f592718..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/TrustScoreCalculator.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.model.Rating;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.DoubleSummaryStatistics;
-
-/**
- * Utility class for calculating user trust scores in the LocalLend platform.
- * 
- * Trust scores are calculated based on multiple factors:
- * - Average rating received
- * - Number of ratings (volume factor)
- * - Recency of ratings (temporal factor)
- * - Consistency of ratings (variance factor)
- * - Rating type mix (verified vs unverified)
- * 
- * The trust score is normalized to a 0-5 scale matching the user trustScore field.
- * Issue #24: Rating Service Logic
- */
-@Component
-public class TrustScoreCalculator {
-    
-    // Algorithm constants - can be tuned based on community feedback
-    private static final double BASE_WEIGHT = 0.4;           // Base average rating weight
-    private static final double VOLUME_WEIGHT = 0.2;        // Number of ratings weight
-    private static final double RECENCY_WEIGHT = 0.2;       // Recent ratings weight
-    private static final double CONSISTENCY_WEIGHT = 0.1;   // Rating consistency weight
-    private static final double VERIFICATION_WEIGHT = 0.1;  // Verification status weight
-    
-    private static final int MIN_RATINGS_FOR_FULL_TRUST = 10; // Minimum ratings for maximum volume score
-    private static final int DAYS_FOR_RECENT_BONUS = 30;      // Days to consider for recency bonus
-    private static final double EXCELLENT_THRESHOLD = 4.5;    // Threshold for excellent ratings
-    
-    /**
-     * Calculate trust score for a user based on their ratings.
-     * Score is on a 0-5 scale to match the User entity trustScore field.
-     * 
-     * @param ratings List of ratings received by the user
-     * @return Trust score between 0.0 and 5.0
-     */
-    public Double calculateTrustScore(List<Rating> ratings) {
-        if (ratings == null || ratings.isEmpty()) {
-            return 5.0; // New users start with neutral 5.0 trust score (Issue #29 default)
-        }
-        
-        // Calculate individual components
-        double baseScore = calculateBaseScore(ratings);
-        double volumeScore = calculateVolumeScore(ratings);
-        double recencyScore = calculateRecencyScore(ratings);
-        double consistencyScore = calculateConsistencyScore(ratings);
-        double verificationScore = calculateVerificationScore(ratings);
-        
-        // Combine scores with weights
-        double trustScore = (baseScore * BASE_WEIGHT) +
-                          (volumeScore * VOLUME_WEIGHT) +
-                          (recencyScore * RECENCY_WEIGHT) +
-                          (consistencyScore * CONSISTENCY_WEIGHT) +
-                          (verificationScore * VERIFICATION_WEIGHT);
-        
-        // Apply any bonuses or penalties
-        trustScore = applyBonusesAndPenalties(trustScore, ratings);
-        
-        // Normalize to 0-5 scale and round to 1 decimal place
-        trustScore = Math.max(0.0, Math.min(5.0, trustScore));
-        return Math.round(trustScore * 10.0) / 10.0;
-    }
-    
-    /**
-     * Calculate base score from average rating.
-     * 
-     * @param ratings List of active ratings
-     * @return Base score (0.0 to 5.0)
-     */
-    private double calculateBaseScore(List<Rating> ratings) {
-        DoubleSummaryStatistics stats = ratings.stream()
-                .mapToDouble(Rating::getRatingValue)
-                .summaryStatistics();
-        
-        return stats.getAverage();
-    }
-    
-    /**
-     * Calculate volume score based on number of ratings.
-     * More ratings generally indicate higher trustworthiness.
-     * 
-     * @param ratings List of active ratings
-     * @return Volume score (0.0 to 5.0)
-     */
-    private double calculateVolumeScore(List<Rating> ratings) {
-        int ratingCount = ratings.size();
-        
-        if (ratingCount == 0) {
-            return 5.0; // Neutral for no ratings
-        }
-        
-        // Logarithmic scale - diminishing returns after MIN_RATINGS_FOR_FULL_TRUST
-        double score = Math.log(ratingCount + 1) / Math.log(MIN_RATINGS_FOR_FULL_TRUST + 1);
-        score = Math.min(1.0, score);
-        
-        // Scale to 0-5, but start from 4.0 to avoid penalizing too heavily
-        return 4.0 + score;
-    }
-    
-    /**
-     * Calculate recency score - recent ratings are weighted higher.
-     * 
-     * @param ratings List of active ratings
-     * @return Recency score (0.0 to 5.0)
-     */
-    private double calculateRecencyScore(List<Rating> ratings) {
-        LocalDateTime now = LocalDateTime.now();
-        
-        double weightedSum = 0.0;
-        double totalWeight = 0.0;
-        
-        for (Rating rating : ratings) {
-            long daysAgo = ChronoUnit.DAYS.between(rating.getCreatedDate(), now);
-            
-            // Calculate recency weight (higher for more recent ratings)
-            double recencyWeight = Math.exp(-daysAgo / (double) DAYS_FOR_RECENT_BONUS);
-            
-            weightedSum += rating.getRatingValue() * recencyWeight;
-            totalWeight += recencyWeight;
-        }
-        
-        return totalWeight > 0 ? weightedSum / totalWeight : 5.0;
-    }
-    
-    /**
-     * Calculate consistency score - consistent ratings are better than volatile ones.
-     * Lower variance in ratings indicates more consistent service.
-     * 
-     * @param ratings List of active ratings
-     * @return Consistency score (0.0 to 5.0)
-     */
-    private double calculateConsistencyScore(List<Rating> ratings) {
-        if (ratings.size() < 2) {
-            return 5.0; // Single rating is perfectly consistent
-        }
-        
-        DoubleSummaryStatistics stats = ratings.stream()
-                .mapToDouble(Rating::getRatingValue)
-                .summaryStatistics();
-        
-        double average = stats.getAverage();
-        
-        // Calculate standard deviation
-        double variance = ratings.stream()
-                .mapToDouble(r -> Math.pow(r.getRatingValue() - average, 2))
-                .sum() / ratings.size();
-        
-        double stdDev = Math.sqrt(variance);
-        
-        // Convert standard deviation to consistency score
-        // Lower stdDev = higher consistency score
-        // Maximum possible stdDev is 2.0 (for 1-5 scale)
-        double consistencyRatio = 1.0 - (stdDev / 2.0);
-        
-        // Scale to average rating range to maintain score around average
-        return Math.max(0.0, average * consistencyRatio);
-    }
-    
-    /**
-     * Calculate verification score based on verified ratings ratio.
-     * Verified ratings (from completed bookings) are more trustworthy.
-     * 
-     * @param ratings List of active ratings
-     * @return Verification score (0.0 to 5.0)
-     */
-    private double calculateVerificationScore(List<Rating> ratings) {
-        long verifiedRatings = ratings.stream()
-                .filter(Rating::getIsVerified)
-                .count();
-        
-        if (ratings.isEmpty()) {
-            return 5.0;
-        }
-        
-        double verificationRatio = (double) verifiedRatings / ratings.size();
-        
-        // Calculate average of verified ratings
-        DoubleSummaryStatistics verifiedStats = ratings.stream()
-                .filter(Rating::getIsVerified)
-                .mapToDouble(Rating::getRatingValue)
-                .summaryStatistics();
-        
-        double verifiedAverage = verifiedStats.getCount() > 0 ? verifiedStats.getAverage() : 5.0;
-        
-        // Weight verified ratings more heavily
-        return verifiedAverage * (0.7 + 0.3 * verificationRatio);
-    }
-    
-    /**
-     * Apply bonuses and penalties based on specific criteria.
-     * 
-     * @param baseScore Current trust score
-     * @param ratings List of active ratings
-     * @return Adjusted trust score
-     */
-    private double applyBonusesAndPenalties(double baseScore, List<Rating> ratings) {
-        double adjustedScore = baseScore;
-        
-        // Excellence bonus: if user has high percentage of excellent ratings (4.5+)
-        long excellentRatings = ratings.stream()
-                .filter(r -> r.getRatingValue() >= EXCELLENT_THRESHOLD)
-                .count();
-        
-        if (excellentRatings > 0) {
-            double excellenceRatio = (double) excellentRatings / ratings.size();
-            if (excellenceRatio >= 0.8) {
-                adjustedScore += 0.3; // Bonus for 80%+ excellent ratings
-            } else if (excellenceRatio >= 0.6) {
-                adjustedScore += 0.2; // Bonus for 60%+ excellent ratings
-            }
-        }
-        
-        // Penalty for having very low ratings
-        long lowRatings = ratings.stream()
-                .filter(r -> r.getRatingValue() <= 2)
-                .count();
-        
-        if (lowRatings > 0) {
-            double lowRatingRatio = (double) lowRatings / ratings.size();
-            if (lowRatingRatio >= 0.3) {
-                adjustedScore -= 0.5; // Penalty for 30%+ low ratings
-            } else if (lowRatingRatio >= 0.15) {
-                adjustedScore -= 0.3; // Penalty for 15%+ low ratings
-            }
-        }
-        
-        // Longevity bonus: ratings spread over time indicate sustained good behavior
-        if (ratings.size() >= 5) {
-            LocalDateTime oldest = ratings.stream()
-                    .map(Rating::getCreatedDate)
-                    .min(LocalDateTime::compareTo)
-                    .orElse(LocalDateTime.now());
-            
-            long daysSinceFirst = ChronoUnit.DAYS.between(oldest, LocalDateTime.now());
-            if (daysSinceFirst >= 90) { // 3+ months of ratings
-                adjustedScore += 0.1; // Small longevity bonus
-            }
-        }
-        
-        return Math.max(0.0, Math.min(5.0, adjustedScore));
-    }
-    
-    /**
-     * Get trust score category based on score value.
-     * 
-     * @param trustScore Trust score (0-5)
-     * @return Trust category description
-     */
-    public String getTrustCategory(double trustScore) {
-        if (trustScore >= 4.5) {
-            return "Excellent";
-        } else if (trustScore >= 3.5) {
-            return "High";
-        } else if (trustScore >= 2.5) {
-            return "Medium";
-        } else {
-            return "Low";
-        }
-    }
-    
-    /**
-     * Get detailed trust score breakdown for debugging/transparency.
-     * 
-     * @param ratings List of ratings
-     * @return TrustScoreBreakdown with component scores
-     */
-    public TrustScoreBreakdown calculateTrustScoreBreakdown(List<Rating> ratings) {
-        if (ratings == null || ratings.isEmpty()) {
-            return new TrustScoreBreakdown(5.0, 5.0, 5.0, 5.0, 5.0, 5.0);
-        }
-        
-        double baseScore = calculateBaseScore(ratings);
-        double volumeScore = calculateVolumeScore(ratings);
-        double recencyScore = calculateRecencyScore(ratings);
-        double consistencyScore = calculateConsistencyScore(ratings);
-        double verificationScore = calculateVerificationScore(ratings);
-        
-        double finalScore = (baseScore * BASE_WEIGHT) +
-                          (volumeScore * VOLUME_WEIGHT) +
-                          (recencyScore * RECENCY_WEIGHT) +
-                          (consistencyScore * CONSISTENCY_WEIGHT) +
-                          (verificationScore * VERIFICATION_WEIGHT);
-        
-        finalScore = applyBonusesAndPenalties(finalScore, ratings);
-        
-        return new TrustScoreBreakdown(
-            Math.round(finalScore * 10.0) / 10.0,
-            Math.round(baseScore * 10.0) / 10.0,
-            Math.round(volumeScore * 10.0) / 10.0,
-            Math.round(recencyScore * 10.0) / 10.0,
-            Math.round(consistencyScore * 10.0) / 10.0,
-            Math.round(verificationScore * 10.0) / 10.0
-        );
-    }
-    
-    /**
-     * Inner class for detailed trust score breakdown.
-     */
-    public static class TrustScoreBreakdown {
-        private final double finalScore;
-        private final double baseScore;
-        private final double volumeScore;
-        private final double recencyScore;
-        private final double consistencyScore;
-        private final double verificationScore;
-        
-        public TrustScoreBreakdown(double finalScore, double baseScore, double volumeScore,
-                                  double recencyScore, double consistencyScore, double verificationScore) {
-            this.finalScore = finalScore;
-            this.baseScore = baseScore;
-            this.volumeScore = volumeScore;
-            this.recencyScore = recencyScore;
-            this.consistencyScore = consistencyScore;
-            this.verificationScore = verificationScore;
-        }
-        
-        // Getters
-        public double getFinalScore() { return finalScore; }
-        public double getBaseScore() { return baseScore; }
-        public double getVolumeScore() { return volumeScore; }
-        public double getRecencyScore() { return recencyScore; }
-        public double getConsistencyScore() { return consistencyScore; }
-        public double getVerificationScore() { return verificationScore; }
-        
-        @Override
-        public String toString() {
-            return String.format(
-                "TrustScore: %.1f (Base: %.1f, Volume: %.1f, Recency: %.1f, Consistency: %.1f, Verification: %.1f)",
-                finalScore, baseScore, volumeScore, recencyScore, consistencyScore, verificationScore
-            );
-        }
-    }
-}
diff --git a/backend/src/main/java/com/locallend/locallend/util/UserMapper.java b/backend/src/main/java/com/locallend/locallend/util/UserMapper.java
deleted file mode 100644
index b7447a548063d0814ed4c3f65a62986c4beb367a..0000000000000000000000000000000000000000
--- a/backend/src/main/java/com/locallend/locallend/util/UserMapper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.locallend.locallend.util;
-
-import com.locallend.locallend.dto.response.UserPublicDto;
-import com.locallend.locallend.dto.response.UserResponseDto;
-import com.locallend.locallend.model.User;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * Mapper utility for converting User entities to DTOs.
- * Ensures sensitive data is not exposed in public responses.
- */
-@Component
-public class UserMapper {
-
-    /**
-     * Convert User entity to full UserResponseDto (for authenticated user).
-     * @param user User entity
-     * @return UserResponseDto with all non-sensitive fields
-     */
-    public UserResponseDto toUserResponseDto(User user) {
-        if (user == null) {
-            return null;
-        }
-
-        UserResponseDto dto = new UserResponseDto();
-        dto.setId(user.getId());
-        dto.setUsername(user.getUsername());
-        dto.setName(user.getName());
-        dto.setEmail(user.getEmail());
-        dto.setPhoneNumber(user.getPhoneNumber());
-        dto.setProfileImageUrl(user.getProfileImageUrl());
-        dto.setRole(user.getRole());
-        dto.setIsActive(user.getIsActive());
-        dto.setCreatedDate(user.getCreatedDate());
-        dto.setTrustScore(user.getTrustScore());
-        dto.setItemCount(user.getItemCount());
-        
-        // Computed fields for Issue #29
-        dto.setMemberSince(formatMemberSince(user.getCreatedDate()));
-        // Note: totalItemsShared and totalBookings require item/booking repository queries
-        // These will be populated when ItemRepository and BookingRepository are integrated
-        dto.setTotalItemsShared(0); // Placeholder
-        dto.setTotalBookings(0);    // Placeholder
-
-        return dto;
-    }
-
-    /**
-     * Convert User entity to UserPublicDto (for public viewing).
-     * Excludes sensitive information like email and phone.
-     * @param user User entity
-     * @return UserPublicDto with only public fields
-     */
-    public UserPublicDto toUserPublicDto(User user) {
-        if (user == null) {
-            return null;
-        }
-
-        UserPublicDto dto = new UserPublicDto();
-        dto.setId(user.getId());
-        dto.setUsername(user.getUsername());
-        dto.setName(user.getName());
-        dto.setProfileImageUrl(user.getProfileImageUrl());
-        dto.setTrustScore(user.getTrustScore());
-        dto.setItemCount(user.getItemCount());
-        
-        // Computed field for Issue #29
-        dto.setMemberSince(formatMemberSince(user.getCreatedDate()));
-
-        return dto;
-    }
-    
-    /**
-     * Format createdDate to "Member since MMMM yyyy" string.
-     * @param createdDate User's created date
-     * @return Formatted string like "Member since January 2024"
-     */
-    private String formatMemberSince(LocalDateTime createdDate) {
-        if (createdDate == null) {
-            return null;
-        }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM yyyy");
-        return "Member since " + createdDate.format(formatter);
-    }
-}
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
deleted file mode 100644
index d04d710987ec215c1cf2ef15033c879c4dffa80c..0000000000000000000000000000000000000000
--- a/backend/src/main/resources/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-spring.application.name=${APP_NAME:locallend}
-spring.data.mongodb.uri=${MONGODB_URI:mongodb://localhost:27017/locallend}
-server.port=${SERVER_PORT:8080}
-server.address=0.0.0.0
-
-# JWT Configuration
-# IMPORTANT: Set these via environment variables in production!
-app.jwt.secret=${JWT_SECRET:change-this-secret-in-production-with-a-very-long-secure-random-string-at-least-256-bits}
-app.jwt.expiration-ms=${JWT_EXPIRATION_MS:86400000}
-
-# Cloudinary Configuration
-# Get these credentials from https://cloudinary.com/console
-# Set via environment variables - NEVER commit real credentials!
-cloudinary.cloud-name=${CLOUDINARY_CLOUD_NAME:your_cloud_name}
-cloudinary.api-key=${CLOUDINARY_API_KEY:your_api_key}
-cloudinary.api-secret=${CLOUDINARY_API_SECRET:your_api_secret}
-
-# File Upload Configuration
-spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=50MB
-spring.servlet.multipart.file-size-threshold=2KB
diff --git a/backend/src/main/resources/static/app.js b/backend/src/main/resources/static/app.js
deleted file mode 100644
index 69a8b20b65a2a6509f82c03662e4600bfd9c35a7..0000000000000000000000000000000000000000
--- a/backend/src/main/resources/static/app.js
+++ /dev/null
@@ -1,540 +0,0 @@
-// API Base URL - will use relative URLs in production
-const API_BASE = '/api';
-
-// Current user state
-let currentUser = null;
-let allItems = [];
-let categories = [];
-
-// Initialize app
-document.addEventListener('DOMContentLoaded', function() {
-    // Check if user is logged in
-    const token = localStorage.getItem('token');
-    const user = localStorage.getItem('user');
-
-    if (token && user) {
-        currentUser = JSON.parse(user);
-        updateNavigation();
-    }
-
-    // Load initial data
-    loadCategories();
-
-    // Show home page by default
-    const hash = window.location.hash.slice(1);
-    if (hash) {
-        showPage(hash);
-    }
-});
-
-// Navigation
-function showPage(pageName) {
-    // Hide all pages
-    document.querySelectorAll('.page').forEach(page => {
-        page.classList.remove('active');
-    });
-
-    // Show requested page
-    const page = document.getElementById(pageName + 'Page');
-    if (page) {
-        page.classList.add('active');
-
-        // Load page-specific data
-        if (pageName === 'browse') {
-            loadItems();
-        } else if (pageName === 'my-items') {
-            if (!currentUser) {
-                showPage('login');
-                return;
-            }
-            loadMyItems();
-        } else if (pageName === 'my-bookings') {
-            if (!currentUser) {
-                showPage('login');
-                return;
-            }
-            loadMyBookings();
-        } else if (pageName === 'add-item') {
-            if (!currentUser) {
-                showPage('login');
-                return;
-            }
-            loadCategoriesForForm();
-        }
-
-        // Update URL hash
-        window.location.hash = pageName;
-    }
-}
-
-function updateNavigation() {
-    if (currentUser) {
-        document.getElementById('loginLink').style.display = 'none';
-        document.getElementById('registerLink').style.display = 'none';
-        document.getElementById('logoutLink').style.display = 'block';
-        document.getElementById('myItemsLink').style.display = 'block';
-        document.getElementById('myBookingsLink').style.display = 'block';
-        document.getElementById('heroLoginBtn').style.display = 'none';
-    } else {
-        document.getElementById('loginLink').style.display = 'block';
-        document.getElementById('registerLink').style.display = 'block';
-        document.getElementById('logoutLink').style.display = 'none';
-        document.getElementById('myItemsLink').style.display = 'none';
-        document.getElementById('myBookingsLink').style.display = 'none';
-        document.getElementById('heroLoginBtn').style.display = 'inline-block';
-    }
-}
-
-// API Helper Functions
-async function apiCall(endpoint, options = {}) {
-    const token = localStorage.getItem('token');
-    const headers = {
-        'Content-Type': 'application/json',
-        ...options.headers
-    };
-
-    if (token) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
-
-    try {
-        const response = await fetch(API_BASE + endpoint, {
-            ...options,
-            headers
-        });
-
-        if (response.status === 401) {
-            logout();
-            throw new Error('Session expired. Please login again.');
-        }
-
-        if (response.status === 204) {
-            return null;
-        }
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            throw new Error(data.message || data.error || 'Request failed');
-        }
-
-        return data;
-    } catch (error) {
-        console.error('API Error:', error);
-        throw error;
-    }
-}
-
-// Auth Functions
-async function handleLogin(event) {
-    event.preventDefault();
-
-    const username = document.getElementById('loginUsername').value;
-    const password = document.getElementById('loginPassword').value;
-    const errorDiv = document.getElementById('loginError');
-
-    try {
-        const response = await apiCall('/auth/login', {
-            method: 'POST',
-            body: JSON.stringify({ username, password })
-        });
-
-        localStorage.setItem('token', response.token);
-        localStorage.setItem('user', JSON.stringify(response.user));
-        currentUser = response.user;
-
-        updateNavigation();
-        showPage('browse');
-
-        // Clear form
-        document.getElementById('loginForm').reset();
-        errorDiv.classList.remove('show');
-    } catch (error) {
-        errorDiv.textContent = error.message;
-        errorDiv.classList.add('show');
-    }
-}
-
-async function handleRegister(event) {
-    event.preventDefault();
-
-    const username = document.getElementById('registerUsername').value;
-    const email = document.getElementById('registerEmail').value;
-    const name = document.getElementById('registerName').value;
-    const phone = document.getElementById('registerPhone').value;
-    const address = document.getElementById('registerAddress').value;
-    const password = document.getElementById('registerPassword').value;
-    const errorDiv = document.getElementById('registerError');
-
-    try {
-        await apiCall('/auth/register', {
-            method: 'POST',
-            body: JSON.stringify({
-                username,
-                email,
-                name,
-                phoneNumber: phone,
-                address,
-                password
-            })
-        });
-
-        // Auto login after registration
-        const loginResponse = await apiCall('/auth/login', {
-            method: 'POST',
-            body: JSON.stringify({ username, password })
-        });
-
-        localStorage.setItem('token', loginResponse.token);
-        localStorage.setItem('user', JSON.stringify(loginResponse.user));
-        currentUser = loginResponse.user;
-
-        updateNavigation();
-        showPage('browse');
-
-        // Clear form
-        document.getElementById('registerForm').reset();
-        errorDiv.classList.remove('show');
-    } catch (error) {
-        errorDiv.textContent = error.message;
-        errorDiv.classList.add('show');
-    }
-}
-
-function logout() {
-    localStorage.removeItem('token');
-    localStorage.removeItem('user');
-    currentUser = null;
-    updateNavigation();
-    showPage('home');
-}
-
-// Category Functions
-async function loadCategories() {
-    try {
-        categories = await apiCall('/categories');
-
-        // Update category filter
-        const categoryFilter = document.getElementById('categoryFilter');
-        if (categoryFilter) {
-            categoryFilter.innerHTML = '<option value="">All Categories</option>';
-            categories.forEach(cat => {
-                const option = document.createElement('option');
-                option.value = cat.id;
-                option.textContent = cat.name;
-                categoryFilter.appendChild(option);
-            });
-        }
-    } catch (error) {
-        console.error('Failed to load categories:', error);
-    }
-}
-
-function loadCategoriesForForm() {
-    const itemCategory = document.getElementById('itemCategory');
-    if (itemCategory) {
-        itemCategory.innerHTML = '<option value="">Select a category</option>';
-        categories.forEach(cat => {
-            const option = document.createElement('option');
-            option.value = cat.id;
-            option.textContent = cat.name;
-            itemCategory.appendChild(option);
-        });
-    }
-}
-
-// Items Functions
-async function loadItems() {
-    const grid = document.getElementById('itemsGrid');
-    grid.innerHTML = '<div class="loading">Loading items...</div>';
-
-    try {
-        const categoryId = document.getElementById('categoryFilter').value;
-        let endpoint = '/items';
-        if (categoryId) {
-            endpoint += `/category/${categoryId}`;
-        }
-
-        allItems = await apiCall(endpoint);
-        displayItems(allItems, grid);
-    } catch (error) {
-        grid.innerHTML = '<div class="loading">Failed to load items</div>';
-        console.error('Failed to load items:', error);
-    }
-}
-
-function displayItems(items, container) {
-    if (items.length === 0) {
-        container.innerHTML = '<div class="loading">No items found</div>';
-        return;
-    }
-
-    container.innerHTML = items.map(item => `
-        <div class="item-card" onclick="showItemDetail('${item.id}')">
-            <img src="${item.imageUrl || 'https://via.placeholder.com/280x200?text=No+Image'}"
-                 alt="${item.name}"
-                 class="item-image"
-                 onerror="this.src='https://via.placeholder.com/280x200?text=No+Image'">
-            <div class="item-content">
-                <span class="item-category">${getCategoryName(item.categoryId)}</span>
-                <span class="item-status ${item.availability ? 'available' : 'unavailable'}">
-                    ${item.availability ? 'Available' : 'Unavailable'}
-                </span>
-                <div class="item-name">${item.name}</div>
-                <div class="item-description">${item.description}</div>
-                <div class="item-price">$${item.pricePerDay}/day</div>
-            </div>
-        </div>
-    `).join('');
-}
-
-function getCategoryName(categoryId) {
-    const category = categories.find(c => c.id === categoryId);
-    return category ? category.name : 'Unknown';
-}
-
-function searchItems() {
-    const searchTerm = document.getElementById('searchInput').value.toLowerCase();
-    const filtered = allItems.filter(item =>
-        item.name.toLowerCase().includes(searchTerm) ||
-        item.description.toLowerCase().includes(searchTerm)
-    );
-    displayItems(filtered, document.getElementById('itemsGrid'));
-}
-
-async function loadMyItems() {
-    const grid = document.getElementById('myItemsGrid');
-    grid.innerHTML = '<div class="loading">Loading your items...</div>';
-
-    try {
-        const items = await apiCall(`/items/owner/${currentUser.id}`);
-
-        if (items.length === 0) {
-            grid.innerHTML = '<div class="loading">You haven\'t added any items yet</div>';
-            return;
-        }
-
-        grid.innerHTML = items.map(item => `
-            <div class="item-card">
-                <img src="${item.imageUrl || 'https://via.placeholder.com/280x200?text=No+Image'}"
-                     alt="${item.name}"
-                     class="item-image"
-                     onerror="this.src='https://via.placeholder.com/280x200?text=No+Image'">
-                <div class="item-content">
-                    <span class="item-category">${getCategoryName(item.categoryId)}</span>
-                    <span class="item-status ${item.availability ? 'available' : 'unavailable'}">
-                        ${item.availability ? 'Available' : 'Unavailable'}
-                    </span>
-                    <div class="item-name">${item.name}</div>
-                    <div class="item-description">${item.description}</div>
-                    <div class="item-price">$${item.pricePerDay}/day</div>
-                    <button onclick="toggleItemAvailability('${item.id}', ${item.availability})" class="btn btn-secondary">
-                        ${item.availability ? 'Mark Unavailable' : 'Mark Available'}
-                    </button>
-                    <button onclick="deleteItem('${item.id}')" class="btn btn-danger">Delete</button>
-                </div>
-            </div>
-        `).join('');
-    } catch (error) {
-        grid.innerHTML = '<div class="loading">Failed to load your items</div>';
-        console.error('Failed to load my items:', error);
-    }
-}
-
-async function handleAddItem(event) {
-    event.preventDefault();
-
-    const name = document.getElementById('itemName').value;
-    const description = document.getElementById('itemDescription').value;
-    const categoryId = document.getElementById('itemCategory').value;
-    const pricePerDay = parseFloat(document.getElementById('itemPrice').value);
-    const imageUrl = document.getElementById('itemImage').value;
-    const errorDiv = document.getElementById('addItemError');
-
-    try {
-        await apiCall('/items', {
-            method: 'POST',
-            body: JSON.stringify({
-                name,
-                description,
-                categoryId,
-                pricePerDay,
-                imageUrl: imageUrl || null,
-                ownerId: currentUser.id
-            })
-        });
-
-        document.getElementById('addItemForm').reset();
-        errorDiv.classList.remove('show');
-        showPage('my-items');
-    } catch (error) {
-        errorDiv.textContent = error.message;
-        errorDiv.classList.add('show');
-    }
-}
-
-async function toggleItemAvailability(itemId, currentAvailability) {
-    try {
-        await apiCall(`/items/${itemId}/availability`, {
-            method: 'PATCH',
-            body: JSON.stringify({ availability: !currentAvailability })
-        });
-        loadMyItems();
-    } catch (error) {
-        alert('Failed to update item availability');
-        console.error('Failed to toggle availability:', error);
-    }
-}
-
-async function deleteItem(itemId) {
-    if (!confirm('Are you sure you want to delete this item?')) {
-        return;
-    }
-
-    try {
-        await apiCall(`/items/${itemId}`, {
-            method: 'DELETE'
-        });
-        loadMyItems();
-    } catch (error) {
-        alert('Failed to delete item');
-        console.error('Failed to delete item:', error);
-    }
-}
-
-// Item Detail
-async function showItemDetail(itemId) {
-    showPage('itemDetail');
-    const content = document.getElementById('itemDetailContent');
-    content.innerHTML = '<div class="loading">Loading item details...</div>';
-
-    try {
-        const item = await apiCall(`/items/${itemId}`);
-
-        content.innerHTML = `
-            <div class="item-detail">
-                <img src="${item.imageUrl || 'https://via.placeholder.com/800x400?text=No+Image'}"
-                     alt="${item.name}"
-                     class="item-detail-image"
-                     onerror="this.src='https://via.placeholder.com/800x400?text=No+Image'">
-                <h1>${item.name}</h1>
-                <div class="item-detail-info">
-                    <span class="item-category">${getCategoryName(item.categoryId)}</span>
-                    <span class="item-status ${item.availability ? 'available' : 'unavailable'}">
-                        ${item.availability ? 'Available' : 'Unavailable'}
-                    </span>
-                </div>
-                <div class="item-detail-section">
-                    <h3>Description</h3>
-                    <p>${item.description}</p>
-                </div>
-                <div class="item-detail-section">
-                    <h3>Price</h3>
-                    <p class="item-price">$${item.pricePerDay}/day</p>
-                </div>
-                ${currentUser && currentUser.id !== item.ownerId && item.availability ? `
-                    <div class="item-detail-section">
-                        <h3>Book this item</h3>
-                        <form id="bookingForm" onsubmit="handleBooking(event, '${item.id}')">
-                            <div class="form-group">
-                                <label>Start Date</label>
-                                <input type="date" id="bookingStartDate" required min="${new Date().toISOString().split('T')[0]}">
-                            </div>
-                            <div class="form-group">
-                                <label>End Date</label>
-                                <input type="date" id="bookingEndDate" required min="${new Date().toISOString().split('T')[0]}">
-                            </div>
-                            <div class="error-message" id="bookingError"></div>
-                            <button type="submit" class="btn btn-primary">Book Now</button>
-                            <button type="button" onclick="showPage('browse')" class="btn btn-secondary">Back to Browse</button>
-                        </form>
-                    </div>
-                ` : `
-                    <button onclick="showPage('browse')" class="btn btn-secondary">Back to Browse</button>
-                `}
-            </div>
-        `;
-    } catch (error) {
-        content.innerHTML = '<div class="loading">Failed to load item details</div>';
-        console.error('Failed to load item detail:', error);
-    }
-}
-
-async function handleBooking(event, itemId) {
-    event.preventDefault();
-
-    const startDate = document.getElementById('bookingStartDate').value;
-    const endDate = document.getElementById('bookingEndDate').value;
-    const errorDiv = document.getElementById('bookingError');
-
-    try {
-        await apiCall('/bookings', {
-            method: 'POST',
-            body: JSON.stringify({
-                itemId,
-                borrowerId: currentUser.id,
-                startDate,
-                endDate
-            })
-        });
-
-        alert('Booking request submitted successfully!');
-        showPage('my-bookings');
-    } catch (error) {
-        errorDiv.textContent = error.message;
-        errorDiv.classList.add('show');
-    }
-}
-
-// Bookings
-async function loadMyBookings() {
-    const container = document.getElementById('bookingsList');
-    container.innerHTML = '<div class="loading">Loading bookings...</div>';
-
-    try {
-        const bookings = await apiCall(`/bookings/borrower/${currentUser.id}`);
-
-        if (bookings.length === 0) {
-            container.innerHTML = '<div class="loading">You have no bookings yet</div>';
-            return;
-        }
-
-        container.innerHTML = bookings.map(booking => `
-            <div class="booking-card">
-                <h3>${booking.itemName || 'Item'}</h3>
-                <div class="booking-info">
-                    <strong>Start Date:</strong> ${new Date(booking.startDate).toLocaleDateString()}
-                </div>
-                <div class="booking-info">
-                    <strong>End Date:</strong> ${new Date(booking.endDate).toLocaleDateString()}
-                </div>
-                <div class="booking-info">
-                    <strong>Total Price:</strong> $${booking.totalPrice}
-                </div>
-                <span class="booking-status ${booking.status}">${booking.status}</span>
-                ${booking.status === 'PENDING' ? `
-                    <button onclick="cancelBooking('${booking.id}')" class="btn btn-danger">Cancel Booking</button>
-                ` : ''}
-            </div>
-        `).join('');
-    } catch (error) {
-        container.innerHTML = '<div class="loading">Failed to load bookings</div>';
-        console.error('Failed to load bookings:', error);
-    }
-}
-
-async function cancelBooking(bookingId) {
-    if (!confirm('Are you sure you want to cancel this booking?')) {
-        return;
-    }
-
-    try {
-        await apiCall(`/bookings/${bookingId}/cancel`, {
-            method: 'PATCH'
-        });
-        loadMyBookings();
-    } catch (error) {
-        alert('Failed to cancel booking');
-        console.error('Failed to cancel booking:', error);
-    }
-}
diff --git a/backend/src/main/resources/static/index.html b/backend/src/main/resources/static/index.html
deleted file mode 100644
index 61fa5251b078b155b1061335cb64cd2493a28573..0000000000000000000000000000000000000000
--- a/backend/src/main/resources/static/index.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>LocalLend - Lend and Borrow Locally</title>
-    <link rel="stylesheet" href="/styles.css">
-</head>
-<body>
-    <!-- Navigation -->
-    <nav class="navbar">
-        <div class="container">
-            <div class="nav-brand">LocalLend</div>
-            <div class="nav-links" id="navLinks">
-                <a href="#" onclick="showPage('home')">Home</a>
-                <a href="#" onclick="showPage('browse')" id="browseLink">Browse</a>
-                <a href="#" onclick="showPage('my-items')" id="myItemsLink" style="display:none;">My Items</a>
-                <a href="#" onclick="showPage('my-bookings')" id="myBookingsLink" style="display:none;">My Bookings</a>
-                <a href="#" onclick="showPage('login')" id="loginLink">Login</a>
-                <a href="#" onclick="showPage('register')" id="registerLink">Register</a>
-                <a href="#" onclick="logout()" id="logoutLink" style="display:none;">Logout</a>
-            </div>
-        </div>
-    </nav>
-
-    <!-- Main Container -->
-    <div class="container main-content">
-
-        <!-- Home Page -->
-        <div id="homePage" class="page active">
-            <div class="hero">
-                <h1>Welcome to LocalLend</h1>
-                <p>Lend and borrow items within your local community</p>
-                <button onclick="showPage('browse')" class="btn btn-primary">Browse Items</button>
-                <button onclick="showPage('login')" class="btn btn-secondary" id="heroLoginBtn">Get Started</button>
-            </div>
-
-            <div class="features">
-                <div class="feature-card">
-                    <h3>🏠 Local</h3>
-                    <p>Connect with people in your community</p>
-                </div>
-                <div class="feature-card">
-                    <h3>💰 Save Money</h3>
-                    <p>Borrow instead of buying</p>
-                </div>
-                <div class="feature-card">
-                    <h3>🌱 Sustainable</h3>
-                    <p>Reduce waste by sharing</p>
-                </div>
-            </div>
-        </div>
-
-        <!-- Login Page -->
-        <div id="loginPage" class="page">
-            <div class="auth-container">
-                <h2>Login</h2>
-                <form id="loginForm" onsubmit="handleLogin(event)">
-                    <div class="form-group">
-                        <label>Username</label>
-                        <input type="text" id="loginUsername" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Password</label>
-                        <input type="password" id="loginPassword" required>
-                    </div>
-                    <div class="error-message" id="loginError"></div>
-                    <button type="submit" class="btn btn-primary">Login</button>
-                </form>
-                <p class="auth-switch">Don't have an account? <a href="#" onclick="showPage('register')">Register</a></p>
-            </div>
-        </div>
-
-        <!-- Register Page -->
-        <div id="registerPage" class="page">
-            <div class="auth-container">
-                <h2>Register</h2>
-                <form id="registerForm" onsubmit="handleRegister(event)">
-                    <div class="form-group">
-                        <label>Username</label>
-                        <input type="text" id="registerUsername" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Email</label>
-                        <input type="email" id="registerEmail" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Full Name</label>
-                        <input type="text" id="registerName" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Phone</label>
-                        <input type="tel" id="registerPhone" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Address</label>
-                        <input type="text" id="registerAddress" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Password</label>
-                        <input type="password" id="registerPassword" required minlength="6">
-                    </div>
-                    <div class="error-message" id="registerError"></div>
-                    <button type="submit" class="btn btn-primary">Register</button>
-                </form>
-                <p class="auth-switch">Already have an account? <a href="#" onclick="showPage('login')">Login</a></p>
-            </div>
-        </div>
-
-        <!-- Browse Items Page -->
-        <div id="browsePage" class="page">
-            <h2>Browse Items</h2>
-            <div class="search-bar">
-                <input type="text" id="searchInput" placeholder="Search items..." onkeyup="searchItems()">
-                <select id="categoryFilter" onchange="loadItems()">
-                    <option value="">All Categories</option>
-                </select>
-            </div>
-            <div class="items-grid" id="itemsGrid">
-                <div class="loading">Loading items...</div>
-            </div>
-        </div>
-
-        <!-- My Items Page -->
-        <div id="myItemsPage" class="page">
-            <div class="page-header">
-                <h2>My Items</h2>
-                <button onclick="showPage('add-item')" class="btn btn-primary">Add Item</button>
-            </div>
-            <div class="items-grid" id="myItemsGrid">
-                <div class="loading">Loading your items...</div>
-            </div>
-        </div>
-
-        <!-- Add Item Page -->
-        <div id="addItemPage" class="page">
-            <div class="auth-container">
-                <h2>Add New Item</h2>
-                <form id="addItemForm" onsubmit="handleAddItem(event)">
-                    <div class="form-group">
-                        <label>Item Name</label>
-                        <input type="text" id="itemName" required>
-                    </div>
-                    <div class="form-group">
-                        <label>Description</label>
-                        <textarea id="itemDescription" required rows="4"></textarea>
-                    </div>
-                    <div class="form-group">
-                        <label>Category</label>
-                        <select id="itemCategory" required></select>
-                    </div>
-                    <div class="form-group">
-                        <label>Price Per Day ($)</label>
-                        <input type="number" id="itemPrice" required min="0" step="0.01">
-                    </div>
-                    <div class="form-group">
-                        <label>Image URL</label>
-                        <input type="url" id="itemImage" placeholder="https://...">
-                    </div>
-                    <div class="error-message" id="addItemError"></div>
-                    <button type="submit" class="btn btn-primary">Add Item</button>
-                    <button type="button" onclick="showPage('my-items')" class="btn btn-secondary">Cancel</button>
-                </form>
-            </div>
-        </div>
-
-        <!-- My Bookings Page -->
-        <div id="myBookingsPage" class="page">
-            <h2>My Bookings</h2>
-            <div class="bookings-list" id="bookingsList">
-                <div class="loading">Loading bookings...</div>
-            </div>
-        </div>
-
-        <!-- Item Detail Page -->
-        <div id="itemDetailPage" class="page">
-            <div id="itemDetailContent"></div>
-        </div>
-
-    </div>
-
-    <script src="/app.js"></script>
-</body>
-</html>
diff --git a/backend/src/main/resources/static/styles.css b/backend/src/main/resources/static/styles.css
deleted file mode 100644
index 65ccbfd7559434a0e4a8b06f98860291862d1241..0000000000000000000000000000000000000000
--- a/backend/src/main/resources/static/styles.css
+++ /dev/null
@@ -1,448 +0,0 @@
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-body {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-    background: #f5f5f5;
-    color: #333;
-}
-
-.container {
-    max-width: 1200px;
-    margin: 0 auto;
-    padding: 0 20px;
-}
-
-/* Navigation */
-.navbar {
-    background: #1976d2;
-    color: white;
-    padding: 1rem 0;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-}
-
-.navbar .container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.nav-brand {
-    font-size: 1.5rem;
-    font-weight: bold;
-}
-
-.nav-links {
-    display: flex;
-    gap: 1.5rem;
-}
-
-.nav-links a {
-    color: white;
-    text-decoration: none;
-    transition: opacity 0.2s;
-}
-
-.nav-links a:hover {
-    opacity: 0.8;
-}
-
-/* Main Content */
-.main-content {
-    padding: 2rem 20px;
-}
-
-.page {
-    display: none;
-}
-
-.page.active {
-    display: block;
-    animation: fadeIn 0.3s;
-}
-
-@keyframes fadeIn {
-    from { opacity: 0; }
-    to { opacity: 1; }
-}
-
-/* Hero Section */
-.hero {
-    text-align: center;
-    padding: 4rem 0;
-    background: white;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    margin-bottom: 2rem;
-}
-
-.hero h1 {
-    font-size: 3rem;
-    margin-bottom: 1rem;
-    color: #1976d2;
-}
-
-.hero p {
-    font-size: 1.25rem;
-    color: #666;
-    margin-bottom: 2rem;
-}
-
-/* Features */
-.features {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    gap: 2rem;
-    margin-top: 3rem;
-}
-
-.feature-card {
-    background: white;
-    padding: 2rem;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    text-align: center;
-}
-
-.feature-card h3 {
-    font-size: 2rem;
-    margin-bottom: 1rem;
-}
-
-/* Buttons */
-.btn {
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 4px;
-    font-size: 1rem;
-    cursor: pointer;
-    transition: all 0.2s;
-    margin: 0.5rem;
-}
-
-.btn-primary {
-    background: #1976d2;
-    color: white;
-}
-
-.btn-primary:hover {
-    background: #1565c0;
-}
-
-.btn-secondary {
-    background: #f5f5f5;
-    color: #333;
-    border: 1px solid #ddd;
-}
-
-.btn-secondary:hover {
-    background: #e0e0e0;
-}
-
-.btn-danger {
-    background: #d32f2f;
-    color: white;
-}
-
-.btn-danger:hover {
-    background: #c62828;
-}
-
-/* Auth Forms */
-.auth-container {
-    max-width: 500px;
-    margin: 2rem auto;
-    background: white;
-    padding: 2rem;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-.auth-container h2 {
-    margin-bottom: 1.5rem;
-    color: #1976d2;
-}
-
-.form-group {
-    margin-bottom: 1.5rem;
-}
-
-.form-group label {
-    display: block;
-    margin-bottom: 0.5rem;
-    font-weight: 500;
-}
-
-.form-group input,
-.form-group select,
-.form-group textarea {
-    width: 100%;
-    padding: 0.75rem;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    font-size: 1rem;
-}
-
-.form-group input:focus,
-.form-group select:focus,
-.form-group textarea:focus {
-    outline: none;
-    border-color: #1976d2;
-}
-
-.error-message {
-    color: #d32f2f;
-    margin-bottom: 1rem;
-    padding: 0.75rem;
-    background: #ffebee;
-    border-radius: 4px;
-    display: none;
-}
-
-.error-message.show {
-    display: block;
-}
-
-.success-message {
-    color: #2e7d32;
-    margin-bottom: 1rem;
-    padding: 0.75rem;
-    background: #e8f5e9;
-    border-radius: 4px;
-    display: none;
-}
-
-.success-message.show {
-    display: block;
-}
-
-.auth-switch {
-    text-align: center;
-    margin-top: 1rem;
-}
-
-.auth-switch a {
-    color: #1976d2;
-    text-decoration: none;
-}
-
-/* Search Bar */
-.search-bar {
-    display: flex;
-    gap: 1rem;
-    margin-bottom: 2rem;
-}
-
-.search-bar input {
-    flex: 1;
-    padding: 0.75rem;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    font-size: 1rem;
-}
-
-.search-bar select {
-    padding: 0.75rem;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    font-size: 1rem;
-}
-
-/* Items Grid */
-.items-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
-    gap: 1.5rem;
-}
-
-.item-card {
-    background: white;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    overflow: hidden;
-    transition: transform 0.2s;
-    cursor: pointer;
-}
-
-.item-card:hover {
-    transform: translateY(-4px);
-    box-shadow: 0 4px 12px rgba(0,0,0,0.15);
-}
-
-.item-image {
-    width: 100%;
-    height: 200px;
-    object-fit: cover;
-    background: #f5f5f5;
-}
-
-.item-content {
-    padding: 1rem;
-}
-
-.item-name {
-    font-size: 1.25rem;
-    font-weight: bold;
-    margin-bottom: 0.5rem;
-}
-
-.item-description {
-    color: #666;
-    margin-bottom: 0.5rem;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-}
-
-.item-price {
-    font-size: 1.25rem;
-    color: #1976d2;
-    font-weight: bold;
-}
-
-.item-category {
-    display: inline-block;
-    padding: 0.25rem 0.75rem;
-    background: #e3f2fd;
-    color: #1976d2;
-    border-radius: 12px;
-    font-size: 0.875rem;
-    margin-bottom: 0.5rem;
-}
-
-.item-status {
-    display: inline-block;
-    padding: 0.25rem 0.75rem;
-    border-radius: 12px;
-    font-size: 0.875rem;
-    margin-left: 0.5rem;
-}
-
-.item-status.available {
-    background: #e8f5e9;
-    color: #2e7d32;
-}
-
-.item-status.unavailable {
-    background: #ffebee;
-    color: #d32f2f;
-}
-
-/* Page Header */
-.page-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 2rem;
-}
-
-/* Loading */
-.loading {
-    text-align: center;
-    padding: 2rem;
-    color: #666;
-}
-
-/* Item Detail */
-.item-detail {
-    background: white;
-    border-radius: 8px;
-    padding: 2rem;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-.item-detail-image {
-    width: 100%;
-    max-height: 400px;
-    object-fit: cover;
-    border-radius: 8px;
-    margin-bottom: 1.5rem;
-}
-
-.item-detail h1 {
-    margin-bottom: 1rem;
-    color: #1976d2;
-}
-
-.item-detail-info {
-    margin-bottom: 1.5rem;
-}
-
-.item-detail-section {
-    margin-bottom: 1.5rem;
-}
-
-.item-detail-section h3 {
-    margin-bottom: 0.5rem;
-}
-
-/* Bookings */
-.booking-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    margin-bottom: 1rem;
-}
-
-.booking-card h3 {
-    color: #1976d2;
-    margin-bottom: 0.5rem;
-}
-
-.booking-info {
-    margin-bottom: 0.5rem;
-    color: #666;
-}
-
-.booking-status {
-    display: inline-block;
-    padding: 0.25rem 0.75rem;
-    border-radius: 12px;
-    font-size: 0.875rem;
-    margin-top: 0.5rem;
-}
-
-.booking-status.PENDING {
-    background: #fff3e0;
-    color: #f57c00;
-}
-
-.booking-status.CONFIRMED {
-    background: #e8f5e9;
-    color: #2e7d32;
-}
-
-.booking-status.CANCELLED {
-    background: #ffebee;
-    color: #d32f2f;
-}
-
-.booking-status.COMPLETED {
-    background: #e3f2fd;
-    color: #1976d2;
-}
-
-/* Responsive */
-@media (max-width: 768px) {
-    .hero h1 {
-        font-size: 2rem;
-    }
-
-    .search-bar {
-        flex-direction: column;
-    }
-
-    .items-grid {
-        grid-template-columns: 1fr;
-    }
-
-    .nav-links {
-        flex-wrap: wrap;
-        gap: 0.5rem;
-    }
-}
diff --git a/backend/src/test/java/com/locallend/locallend/LocallendApplicationTests.java b/backend/src/test/java/com/locallend/locallend/LocallendApplicationTests.java
deleted file mode 100644
index f441e7ca721209a3ca4bcfc82f9ae3d64ca98140..0000000000000000000000000000000000000000
--- a/backend/src/test/java/com/locallend/locallend/LocallendApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.locallend.locallend;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class LocallendApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
diff --git a/backend/target/classes/application.properties b/backend/target/classes/application.properties
deleted file mode 100644
index c6c25071dd7e22450035762c5e9881fa4e913860..0000000000000000000000000000000000000000
--- a/backend/target/classes/application.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-spring.application.name=${APP_NAME:locallend}
-spring.data.mongodb.uri=${MONGODB_URI:mongodb://localhost:27017/locallend}
-server.port=${SERVER_PORT:8080}
-
-# JWT Configuration
-# IMPORTANT: Set these via environment variables in production!
-app.jwt.secret=${JWT_SECRET:change-this-secret-in-production-with-a-very-long-secure-random-string-at-least-256-bits}
-app.jwt.expiration-ms=${JWT_EXPIRATION_MS:86400000}
-
-# Cloudinary Configuration
-# Get these credentials from https://cloudinary.com/console
-# Set via environment variables - NEVER commit real credentials!
-cloudinary.cloud-name=${CLOUDINARY_CLOUD_NAME:your_cloud_name}
-cloudinary.api-key=${CLOUDINARY_API_KEY:your_api_key}
-cloudinary.api-secret=${CLOUDINARY_API_SECRET:your_api_secret}
-
-# File Upload Configuration
-spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=50MB
-spring.servlet.multipart.file-size-threshold=2KB
diff --git a/backend/target/classes/com/locallend/locallend/LocallendApplication.class b/backend/target/classes/com/locallend/locallend/LocallendApplication.class
deleted file mode 100644
index 2ef61d54b715641dac8fc12f0772df95d4dc23e6..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/LocallendApplication.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/CategoryDataInitializer.class b/backend/target/classes/com/locallend/locallend/config/CategoryDataInitializer.class
deleted file mode 100644
index 10fb05bfb35e97f46c8756f0357195e334f52f70..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/CategoryDataInitializer.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/CloudinaryConfig.class b/backend/target/classes/com/locallend/locallend/config/CloudinaryConfig.class
deleted file mode 100644
index 9a6c050847aecf85c2a6c994e1f9cf8d4de34c9c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/CloudinaryConfig.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/CorsConfig.class b/backend/target/classes/com/locallend/locallend/config/CorsConfig.class
deleted file mode 100644
index 70201ca11b456a9f1f21e3b60971b157886455e5..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/CorsConfig.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/MongoTextIndexInitializer.class b/backend/target/classes/com/locallend/locallend/config/MongoTextIndexInitializer.class
deleted file mode 100644
index 03f440b694d08c3bd4d5539717b765c96bc11dac..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/MongoTextIndexInitializer.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/SecurityConfig.class b/backend/target/classes/com/locallend/locallend/config/SecurityConfig.class
deleted file mode 100644
index bc86a0cc4938d874a939dc32150f61a39d8c16fa..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/SecurityConfig.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/config/ValidationConfig.class b/backend/target/classes/com/locallend/locallend/config/ValidationConfig.class
deleted file mode 100644
index 9c2e23989799432a9ddcb1c70ffc1c53966b761b..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/config/ValidationConfig.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/AuthController.class b/backend/target/classes/com/locallend/locallend/controller/AuthController.class
deleted file mode 100644
index 21f4dcf62fada356993e373402e62601092c09e7..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/AuthController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/BookingController.class b/backend/target/classes/com/locallend/locallend/controller/BookingController.class
deleted file mode 100644
index c68274f489e05f067bc26bc11d4d40f12ecca426..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/BookingController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/CategoryController.class b/backend/target/classes/com/locallend/locallend/controller/CategoryController.class
deleted file mode 100644
index d412311efa614336055e497244670a6d0471679d..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/CategoryController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/ImageController.class b/backend/target/classes/com/locallend/locallend/controller/ImageController.class
deleted file mode 100644
index edb187ce0f19e545bbca26990a0cce1d408129c1..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/ImageController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/ItemController.class b/backend/target/classes/com/locallend/locallend/controller/ItemController.class
deleted file mode 100644
index 729427a63232dc1e61a35685b1ceda2dd5c6e53d..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/ItemController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/RatingController.class b/backend/target/classes/com/locallend/locallend/controller/RatingController.class
deleted file mode 100644
index 7d8de07eba1c73a16f2cdce33c80da621c07c140..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/RatingController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/controller/UserController.class b/backend/target/classes/com/locallend/locallend/controller/UserController.class
deleted file mode 100644
index 3aaeeaa87e22d80dcc651c8963c7c46f01b28b7b..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/controller/UserController.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/CategoryDto$Builder.class b/backend/target/classes/com/locallend/locallend/dto/CategoryDto$Builder.class
deleted file mode 100644
index 72170bb82a8e25230035290751cb5679b2ecee45..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/CategoryDto$Builder.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/CategoryDto.class b/backend/target/classes/com/locallend/locallend/dto/CategoryDto.class
deleted file mode 100644
index 6805a45c9a3c769772c002da2481defc8e852303..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/CategoryDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/CreateCategoryRequest.class b/backend/target/classes/com/locallend/locallend/dto/CreateCategoryRequest.class
deleted file mode 100644
index 99820c80eb443b80f78f67918bbba5b36fb1e4f7..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/CreateCategoryRequest.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/CreateItemRequest.class b/backend/target/classes/com/locallend/locallend/dto/CreateItemRequest.class
deleted file mode 100644
index a29be5469951dc81f2022709736060bbf27845b1..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/CreateItemRequest.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/ItemDTO.class b/backend/target/classes/com/locallend/locallend/dto/ItemDTO.class
deleted file mode 100644
index 04a1432cb7d7172bc571e018849e4cefd20f9ae8..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/ItemDTO.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/UpdateItemRequest.class b/backend/target/classes/com/locallend/locallend/dto/UpdateItemRequest.class
deleted file mode 100644
index a7a8467bc3e35659de1f2c1e3f3b36039e396caf..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/UpdateItemRequest.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/BookingRequestDto.class b/backend/target/classes/com/locallend/locallend/dto/request/BookingRequestDto.class
deleted file mode 100644
index fba07fbe92859d29a76f87b26f511dece55fbaac..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/BookingRequestDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/ItemRequestDto.class b/backend/target/classes/com/locallend/locallend/dto/request/ItemRequestDto.class
deleted file mode 100644
index 6818b21142f5f5356ce62c42451881b7ed2fb07c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/ItemRequestDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/ItemUpdateDto.class b/backend/target/classes/com/locallend/locallend/dto/request/ItemUpdateDto.class
deleted file mode 100644
index 02894403b2d5ffeb30226b92822dbd2eee37c2e4..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/ItemUpdateDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/RatingCreateDto.class b/backend/target/classes/com/locallend/locallend/dto/request/RatingCreateDto.class
deleted file mode 100644
index 41eb2222371fd534b80c3ed9c67c6c45afcbd503..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/RatingCreateDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/UserLoginDto.class b/backend/target/classes/com/locallend/locallend/dto/request/UserLoginDto.class
deleted file mode 100644
index 845a21fc805d75bdef2d4f936a16a5108fdb7638..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/UserLoginDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/UserRegistrationDto.class b/backend/target/classes/com/locallend/locallend/dto/request/UserRegistrationDto.class
deleted file mode 100644
index d9d7415b787cbf087efe122e576dc21ede0718f9..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/UserRegistrationDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/request/UserUpdateDto.class b/backend/target/classes/com/locallend/locallend/dto/request/UserUpdateDto.class
deleted file mode 100644
index 040ac6324b40b522cbc7811dcc47f0ba021f4e78..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/request/UserUpdateDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/BookingResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/BookingResponseDto.class
deleted file mode 100644
index 770d29a7182c7336aa118248a7dc936a6389f560..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/BookingResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/CategoryResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/CategoryResponseDto.class
deleted file mode 100644
index 78871deab48ab2e4e12f3aa231defda00f5bce60..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/CategoryResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/ItemResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/ItemResponseDto.class
deleted file mode 100644
index 73ee660f610c6044e4b8776591fc2e78a0cad147..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/ItemResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/ItemSummaryDto.class b/backend/target/classes/com/locallend/locallend/dto/response/ItemSummaryDto.class
deleted file mode 100644
index 30fd29a28700929091aa6eb09550de574a503a51..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/ItemSummaryDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/JwtAuthResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/JwtAuthResponseDto.class
deleted file mode 100644
index bc5b53236e8b480f62a72c18f9d3efb6a8c97997..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/JwtAuthResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/RatingResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/RatingResponseDto.class
deleted file mode 100644
index a3d69f63fa10601c721af422e2c27f0c80fdba70..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/RatingResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/RatingStatsResponse.class b/backend/target/classes/com/locallend/locallend/dto/response/RatingStatsResponse.class
deleted file mode 100644
index 60162a50500905353faa74f92a20c24f26a5f8a8..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/RatingStatsResponse.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/UserPublicDto.class b/backend/target/classes/com/locallend/locallend/dto/response/UserPublicDto.class
deleted file mode 100644
index c8bec37038cc5ada2172cf2ae4e3ba43c16eaa2e..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/UserPublicDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/dto/response/UserResponseDto.class b/backend/target/classes/com/locallend/locallend/dto/response/UserResponseDto.class
deleted file mode 100644
index 26a77b9d4503fcc9666737f8c69703cab086df86..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/dto/response/UserResponseDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/BookingConflictException.class b/backend/target/classes/com/locallend/locallend/exception/BookingConflictException.class
deleted file mode 100644
index 04acf829f19ae442fa086505e46da513845e4854..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/BookingConflictException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/BookingNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/BookingNotFoundException.class
deleted file mode 100644
index a79b1ad868a64e48ec210863094c3efdcbd6f19f..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/BookingNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/BusinessException.class b/backend/target/classes/com/locallend/locallend/exception/BusinessException.class
deleted file mode 100644
index 66f3182926e8acc203d5585f50f765ed24c841f4..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/BusinessException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/CategoryNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/CategoryNotFoundException.class
deleted file mode 100644
index 2ae130f11e857c3385fb4d7dcbb86b7186beb431..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/CategoryNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/DuplicateResourceException.class b/backend/target/classes/com/locallend/locallend/exception/DuplicateResourceException.class
deleted file mode 100644
index 25a2cc193c16266505e11b19b2ea86fba06966ca..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/DuplicateResourceException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ErrorResponse.class b/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ErrorResponse.class
deleted file mode 100644
index 55129e745f904da03b835c207062c3fbf8bcc7e6..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ErrorResponse.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ValidationErrorResponse.class b/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ValidationErrorResponse.class
deleted file mode 100644
index 6103e697e2bccdb7e91e7c709afa24301c4a497b..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler$ValidationErrorResponse.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler.class b/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler.class
deleted file mode 100644
index 2fb98f2c9d93c49c3868436cc5cf26e10b8a050f..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/GlobalExceptionHandler.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/InsufficientTrustScoreException.class b/backend/target/classes/com/locallend/locallend/exception/InsufficientTrustScoreException.class
deleted file mode 100644
index d38f2f1e6b06ceadec26e27474693cd8787ba8df..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/InsufficientTrustScoreException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/InvalidBookingPeriodException.class b/backend/target/classes/com/locallend/locallend/exception/InvalidBookingPeriodException.class
deleted file mode 100644
index 6de17391d57ac3854697f2e5dc6b973858256c8e..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/InvalidBookingPeriodException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/InvalidOperationException.class b/backend/target/classes/com/locallend/locallend/exception/InvalidOperationException.class
deleted file mode 100644
index 466ed3296af04a880473cf329abad59f3006c5a7..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/InvalidOperationException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/InvalidStateTransitionException.class b/backend/target/classes/com/locallend/locallend/exception/InvalidStateTransitionException.class
deleted file mode 100644
index af159201c33ac93f6bc96f93f979208ffba60070..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/InvalidStateTransitionException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/ItemNotAvailableException.class b/backend/target/classes/com/locallend/locallend/exception/ItemNotAvailableException.class
deleted file mode 100644
index 3df8755b32410e3f4129948fd6a4b1d7790880cb..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/ItemNotAvailableException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/ItemNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/ItemNotFoundException.class
deleted file mode 100644
index b72012330f04af927ceb60c2a44d9aa9adce2f57..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/ItemNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/RatingNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/RatingNotFoundException.class
deleted file mode 100644
index f196a66ff5f79c3288df3b1a657b4b4b04cb1b3a..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/RatingNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/ResourceNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/ResourceNotFoundException.class
deleted file mode 100644
index eb7b46e1f337f983a5c8705c57ace7f7b191624f..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/ResourceNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/UnauthorizedAccessException.class b/backend/target/classes/com/locallend/locallend/exception/UnauthorizedAccessException.class
deleted file mode 100644
index 32c15b0953adf31a549dbc9cc2a045d6ad724a57..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/UnauthorizedAccessException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/UnauthorizedItemAccessException.class b/backend/target/classes/com/locallend/locallend/exception/UnauthorizedItemAccessException.class
deleted file mode 100644
index 2f47b670bc4e719fa53110b26376a2c6736bb7e0..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/UnauthorizedItemAccessException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/UserNotFoundException.class b/backend/target/classes/com/locallend/locallend/exception/UserNotFoundException.class
deleted file mode 100644
index 8c79551e7030cef1941d85d8f03af9fea09ae7ec..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/UserNotFoundException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/exception/ValidationException.class b/backend/target/classes/com/locallend/locallend/exception/ValidationException.class
deleted file mode 100644
index aebb5f011bd4a3c0ff366d5a09a277beda5c8005..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/exception/ValidationException.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/Booking.class b/backend/target/classes/com/locallend/locallend/model/Booking.class
deleted file mode 100644
index c58affd0d795d16e9fb902da716869445c5f436c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/Booking.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/Category.class b/backend/target/classes/com/locallend/locallend/model/Category.class
deleted file mode 100644
index b442bec842f0ea3b53b1f0b77082e5318f870200..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/Category.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/Item.class b/backend/target/classes/com/locallend/locallend/model/Item.class
deleted file mode 100644
index 20571105173d10ff1219be5859bbea138f7f1029..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/Item.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/Rating.class b/backend/target/classes/com/locallend/locallend/model/Rating.class
deleted file mode 100644
index 98ac41d9edb91daa7af0e2944edb3795d47c95be..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/Rating.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/RatingType.class b/backend/target/classes/com/locallend/locallend/model/RatingType.class
deleted file mode 100644
index 5ebb337a56d71e00d59f3c0116feaca93d309dbc..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/RatingType.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/User.class b/backend/target/classes/com/locallend/locallend/model/User.class
deleted file mode 100644
index 30d0ddd1f5261791d0f94d9174f8e9261f9be86c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/User.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus$1.class b/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus$1.class
deleted file mode 100644
index e5a9b802282f848da274d16b1f2d75bc8871b3fe..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus$1.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus.class b/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus.class
deleted file mode 100644
index 734ca4e140cf21596a03b1f229b99d71f2cef122..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/enums/BookingStatus.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/enums/ItemCondition.class b/backend/target/classes/com/locallend/locallend/model/enums/ItemCondition.class
deleted file mode 100644
index d1efc9047c321b8a772e6cd70fd114a4153ee0d9..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/enums/ItemCondition.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/model/enums/ItemStatus.class b/backend/target/classes/com/locallend/locallend/model/enums/ItemStatus.class
deleted file mode 100644
index 6ed9048b9ae47f1d9a94704915648fd402758e84..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/model/enums/ItemStatus.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/BookingRepository.class b/backend/target/classes/com/locallend/locallend/repository/BookingRepository.class
deleted file mode 100644
index f8770cf5155b040e4bf81a414281b45100bf2c37..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/BookingRepository.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/CategoryRepository.class b/backend/target/classes/com/locallend/locallend/repository/CategoryRepository.class
deleted file mode 100644
index 48ec6cfd3d646e94e9ec5ec24bf8a8b01e67fc44..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/CategoryRepository.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/ItemRepository.class b/backend/target/classes/com/locallend/locallend/repository/ItemRepository.class
deleted file mode 100644
index 97c93160e197962e58869ea8b32e70cd16b3f47c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/ItemRepository.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/RatingRepository$ItemRatingAggregate.class b/backend/target/classes/com/locallend/locallend/repository/RatingRepository$ItemRatingAggregate.class
deleted file mode 100644
index c6f8f92e66d4bb0ad4e24afaf0f383464aaef624..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/RatingRepository$ItemRatingAggregate.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/RatingRepository$UserRatingAggregate.class b/backend/target/classes/com/locallend/locallend/repository/RatingRepository$UserRatingAggregate.class
deleted file mode 100644
index 1c4d63c9ef638f91247a7370c051ac081e415eed..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/RatingRepository$UserRatingAggregate.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/RatingRepository.class b/backend/target/classes/com/locallend/locallend/repository/RatingRepository.class
deleted file mode 100644
index 0f59020e1266fecf0afb3fc3bba3b366c4d55cfa..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/RatingRepository.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/repository/UserRepository.class b/backend/target/classes/com/locallend/locallend/repository/UserRepository.class
deleted file mode 100644
index 0841d70265ccac5817e2643ca5f8975f3f4d2538..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/repository/UserRepository.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/security/JwtAuthenticationFilter.class b/backend/target/classes/com/locallend/locallend/security/JwtAuthenticationFilter.class
deleted file mode 100644
index 27d3c2eaa92604cc9f443131a12a72fe5e915a36..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/security/JwtAuthenticationFilter.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/security/JwtTokenProvider.class b/backend/target/classes/com/locallend/locallend/security/JwtTokenProvider.class
deleted file mode 100644
index 42aecf2b8188328a6f4e209e65a280d89f486c41..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/security/JwtTokenProvider.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/security/MongoUserDetailsService.class b/backend/target/classes/com/locallend/locallend/security/MongoUserDetailsService.class
deleted file mode 100644
index 88729085b43b3496bdf1211632e6316086ef9a1f..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/security/MongoUserDetailsService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/security/MongoUserPrincipal.class b/backend/target/classes/com/locallend/locallend/security/MongoUserPrincipal.class
deleted file mode 100644
index 4d2f590609e0553b8dd7b7879227c3ab40a42062..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/security/MongoUserPrincipal.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/BookingService.class b/backend/target/classes/com/locallend/locallend/service/BookingService.class
deleted file mode 100644
index 46c667774e4f1ffbf5fcb4ebae42f7ad0c82eef7..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/BookingService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/CategoryService.class b/backend/target/classes/com/locallend/locallend/service/CategoryService.class
deleted file mode 100644
index 6ab02de5273fe2adf89d7ddb301be1872524965f..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/CategoryService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/ImageService.class b/backend/target/classes/com/locallend/locallend/service/ImageService.class
deleted file mode 100644
index 9eea6911568dde03f1ae25ae06bf58aaf0441426..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/ImageService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/ItemService.class b/backend/target/classes/com/locallend/locallend/service/ItemService.class
deleted file mode 100644
index cb6cd25be4c02719ca28291a6709f230fe0f24f5..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/ItemService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/PasswordService.class b/backend/target/classes/com/locallend/locallend/service/PasswordService.class
deleted file mode 100644
index dbe9d92f466f5c53b46854329b415f422f760dcb..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/PasswordService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/RatingService$RatingStatistics.class b/backend/target/classes/com/locallend/locallend/service/RatingService$RatingStatistics.class
deleted file mode 100644
index 2c22f14c2d7b22a2494a0b63bbe26350f55bcbce..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/RatingService$RatingStatistics.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/RatingService.class b/backend/target/classes/com/locallend/locallend/service/RatingService.class
deleted file mode 100644
index f75413cef510a5bda2a2f4d15fa540958e22de73..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/RatingService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/UserQueryService.class b/backend/target/classes/com/locallend/locallend/service/UserQueryService.class
deleted file mode 100644
index 4896acfc5f7cc7226ee15b1ba6f74129673429e4..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/UserQueryService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/UserService.class b/backend/target/classes/com/locallend/locallend/service/UserService.class
deleted file mode 100644
index e4c191bd4046c3fceae23d949b1686ebc07090c8..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/UserService.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/service/dto/UserStatsDto.class b/backend/target/classes/com/locallend/locallend/service/dto/UserStatsDto.class
deleted file mode 100644
index a325df5bd7b88dc111be69b3a08ea2c98d860e44..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/service/dto/UserStatsDto.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/BookingFactory.class b/backend/target/classes/com/locallend/locallend/util/BookingFactory.class
deleted file mode 100644
index 3b328cc4e9086a78e3cb2f32ed7421202f268075..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/BookingFactory.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/BookingMapper.class b/backend/target/classes/com/locallend/locallend/util/BookingMapper.class
deleted file mode 100644
index 261842e01a5913cd47305b6164da8caf0c00978c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/BookingMapper.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/BookingValidator$1.class b/backend/target/classes/com/locallend/locallend/util/BookingValidator$1.class
deleted file mode 100644
index 5bfeb7ab591fcab4446e038f1239bb9c10b95663..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/BookingValidator$1.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/BookingValidator.class b/backend/target/classes/com/locallend/locallend/util/BookingValidator.class
deleted file mode 100644
index 7c492e3f4a71ab995913f8cceeab85b25e71ea69..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/BookingValidator.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/DateTimeUtil.class b/backend/target/classes/com/locallend/locallend/util/DateTimeUtil.class
deleted file mode 100644
index 8a20a059878a98553d161c6283a5282a366b3bcd..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/DateTimeUtil.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/ItemMapper.class b/backend/target/classes/com/locallend/locallend/util/ItemMapper.class
deleted file mode 100644
index c1d23580c5e8eb467947cd4b81db8d8f223375c3..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/ItemMapper.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/RatingMapper.class b/backend/target/classes/com/locallend/locallend/util/RatingMapper.class
deleted file mode 100644
index f71c2cd4c24250daa3f318fc8fba623305363900..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/RatingMapper.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/SecurityUtils.class b/backend/target/classes/com/locallend/locallend/util/SecurityUtils.class
deleted file mode 100644
index 13b4306b3cf2019f432097740f459d5c35a0e6f6..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/SecurityUtils.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator$TrustScoreBreakdown.class b/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator$TrustScoreBreakdown.class
deleted file mode 100644
index 82e3ada991bb15829000dc8048dd8fc2f991e915..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator$TrustScoreBreakdown.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator.class b/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator.class
deleted file mode 100644
index bd874b496193b865aeed2464cf0014a857b52a3c..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/TrustScoreCalculator.class and /dev/null differ
diff --git a/backend/target/classes/com/locallend/locallend/util/UserMapper.class b/backend/target/classes/com/locallend/locallend/util/UserMapper.class
deleted file mode 100644
index bdf07e00bed859ecaa2b1ccd66bf51fa84a6d501..0000000000000000000000000000000000000000
Binary files a/backend/target/classes/com/locallend/locallend/util/UserMapper.class and /dev/null differ
diff --git a/backend/target/locallend-0.0.1-SNAPSHOT.jar b/backend/target/locallend-0.0.1-SNAPSHOT.jar
deleted file mode 100644
index 7725cb89e2f1ca829980fca684de08f9717a2f15..0000000000000000000000000000000000000000
--- a/backend/target/locallend-0.0.1-SNAPSHOT.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c063e9efa087d4bcc514c4779c0428b842d89eec242aef24c5f9430a698139a
-size 37086296
diff --git a/backend/target/locallend-0.0.1-SNAPSHOT.jar.original b/backend/target/locallend-0.0.1-SNAPSHOT.jar.original
deleted file mode 100644
index 0bdb438a0b5fc8e3b49eeace5d415b204bc6bffd..0000000000000000000000000000000000000000
--- a/backend/target/locallend-0.0.1-SNAPSHOT.jar.original
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dcc971d299c48a6ae037bd3af13f6dc23b80e74efd5a7c582d528cd41d716b4
-size 186140
diff --git a/backend/target/maven-archiver/pom.properties b/backend/target/maven-archiver/pom.properties
deleted file mode 100644
index 98ed3e1055e10939fbbea403692d9c77c4158557..0000000000000000000000000000000000000000
--- a/backend/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=locallend
-groupId=com.locallend
-version=0.0.1-SNAPSHOT
diff --git a/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index c72951380794a67cada57053eaf2f84b052e52d4..0000000000000000000000000000000000000000
--- a/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,98 +0,0 @@
-com/locallend/locallend/service/BookingService.class
-com/locallend/locallend/exception/UnauthorizedItemAccessException.class
-com/locallend/locallend/model/enums/BookingStatus$1.class
-com/locallend/locallend/exception/InvalidStateTransitionException.class
-com/locallend/locallend/repository/CategoryRepository.class
-com/locallend/locallend/service/ImageService.class
-com/locallend/locallend/model/enums/ItemCondition.class
-com/locallend/locallend/model/Rating.class
-com/locallend/locallend/model/RatingType.class
-com/locallend/locallend/exception/InvalidBookingPeriodException.class
-com/locallend/locallend/exception/GlobalExceptionHandler.class
-com/locallend/locallend/config/MongoTextIndexInitializer.class
-com/locallend/locallend/security/JwtTokenProvider.class
-com/locallend/locallend/dto/CreateItemRequest.class
-com/locallend/locallend/exception/UserNotFoundException.class
-com/locallend/locallend/controller/CategoryController.class
-com/locallend/locallend/dto/UpdateItemRequest.class
-com/locallend/locallend/controller/ItemController.class
-com/locallend/locallend/repository/UserRepository.class
-com/locallend/locallend/repository/RatingRepository.class
-com/locallend/locallend/exception/ValidationException.class
-com/locallend/locallend/util/BookingValidator.class
-com/locallend/locallend/util/SecurityUtils.class
-com/locallend/locallend/dto/response/BookingResponseDto.class
-com/locallend/locallend/util/DateTimeUtil.class
-com/locallend/locallend/dto/response/UserResponseDto.class
-com/locallend/locallend/repository/BookingRepository.class
-com/locallend/locallend/exception/BookingNotFoundException.class
-com/locallend/locallend/config/CloudinaryConfig.class
-com/locallend/locallend/util/RatingMapper.class
-com/locallend/locallend/dto/request/RatingCreateDto.class
-com/locallend/locallend/dto/response/CategoryResponseDto.class
-com/locallend/locallend/security/JwtAuthenticationFilter.class
-com/locallend/locallend/service/dto/UserStatsDto.class
-com/locallend/locallend/service/CategoryService.class
-com/locallend/locallend/controller/ImageController.class
-com/locallend/locallend/service/PasswordService.class
-com/locallend/locallend/config/SecurityConfig.class
-com/locallend/locallend/service/UserService.class
-com/locallend/locallend/config/CategoryDataInitializer.class
-com/locallend/locallend/dto/request/UserRegistrationDto.class
-com/locallend/locallend/config/ValidationConfig.class
-com/locallend/locallend/exception/CategoryNotFoundException.class
-com/locallend/locallend/controller/RatingController.class
-com/locallend/locallend/dto/response/RatingStatsResponse.class
-com/locallend/locallend/dto/ItemDTO.class
-com/locallend/locallend/dto/CreateCategoryRequest.class
-com/locallend/locallend/exception/InsufficientTrustScoreException.class
-com/locallend/locallend/service/RatingService.class
-com/locallend/locallend/controller/BookingController.class
-com/locallend/locallend/model/Booking.class
-com/locallend/locallend/dto/request/BookingRequestDto.class
-com/locallend/locallend/dto/request/UserLoginDto.class
-com/locallend/locallend/exception/ItemNotFoundException.class
-com/locallend/locallend/dto/request/UserUpdateDto.class
-com/locallend/locallend/service/ItemService.class
-com/locallend/locallend/dto/CategoryDto$Builder.class
-com/locallend/locallend/dto/request/ItemRequestDto.class
-com/locallend/locallend/util/BookingMapper.class
-com/locallend/locallend/exception/UnauthorizedAccessException.class
-com/locallend/locallend/exception/BookingConflictException.class
-com/locallend/locallend/dto/request/ItemUpdateDto.class
-com/locallend/locallend/model/User.class
-com/locallend/locallend/model/Category.class
-com/locallend/locallend/util/BookingFactory.class
-com/locallend/locallend/exception/InvalidOperationException.class
-com/locallend/locallend/dto/response/UserPublicDto.class
-com/locallend/locallend/util/BookingValidator$1.class
-com/locallend/locallend/util/TrustScoreCalculator.class
-com/locallend/locallend/exception/ResourceNotFoundException.class
-com/locallend/locallend/service/UserQueryService.class
-com/locallend/locallend/dto/response/ItemResponseDto.class
-com/locallend/locallend/util/ItemMapper.class
-com/locallend/locallend/controller/UserController.class
-com/locallend/locallend/model/enums/BookingStatus.class
-com/locallend/locallend/model/Item.class
-com/locallend/locallend/controller/AuthController.class
-com/locallend/locallend/exception/GlobalExceptionHandler$ErrorResponse.class
-com/locallend/locallend/repository/ItemRepository.class
-com/locallend/locallend/repository/RatingRepository$UserRatingAggregate.class
-com/locallend/locallend/dto/response/ItemSummaryDto.class
-com/locallend/locallend/security/MongoUserPrincipal.class
-com/locallend/locallend/exception/ItemNotAvailableException.class
-com/locallend/locallend/model/enums/ItemStatus.class
-com/locallend/locallend/service/RatingService$RatingStatistics.class
-com/locallend/locallend/security/MongoUserDetailsService.class
-com/locallend/locallend/exception/RatingNotFoundException.class
-com/locallend/locallend/LocallendApplication.class
-com/locallend/locallend/config/CorsConfig.class
-com/locallend/locallend/util/UserMapper.class
-com/locallend/locallend/exception/GlobalExceptionHandler$ValidationErrorResponse.class
-com/locallend/locallend/dto/response/JwtAuthResponseDto.class
-com/locallend/locallend/dto/CategoryDto.class
-com/locallend/locallend/dto/response/RatingResponseDto.class
-com/locallend/locallend/exception/DuplicateResourceException.class
-com/locallend/locallend/exception/BusinessException.class
-com/locallend/locallend/repository/RatingRepository$ItemRatingAggregate.class
-com/locallend/locallend/util/TrustScoreCalculator$TrustScoreBreakdown.class
diff --git a/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index bce884f234db49d52c45a881ee0ae9421725e3be..0000000000000000000000000000000000000000
--- a/backend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,89 +0,0 @@
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/LocallendApplication.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/CategoryDataInitializer.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/CloudinaryConfig.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/CorsConfig.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/MongoTextIndexInitializer.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/SecurityConfig.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/config/ValidationConfig.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/AuthController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/BookingController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/CategoryController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/ImageController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/ItemController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/RatingController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/controller/UserController.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/CategoryDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/CreateCategoryRequest.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/CreateItemRequest.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/ItemDTO.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/UpdateItemRequest.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/BookingRequestDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/ItemRequestDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/ItemUpdateDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/RatingCreateDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/UserLoginDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/UserRegistrationDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/request/UserUpdateDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/BookingResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/CategoryResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/ItemResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/ItemSummaryDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/JwtAuthResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/RatingResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/RatingStatsResponse.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/UserPublicDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/dto/response/UserResponseDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/BookingConflictException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/BookingNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/BusinessException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/CategoryNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/DuplicateResourceException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/GlobalExceptionHandler.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/InsufficientTrustScoreException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/InvalidBookingPeriodException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/InvalidOperationException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/InvalidStateTransitionException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/ItemNotAvailableException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/ItemNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/RatingNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/ResourceNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedAccessException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/UnauthorizedItemAccessException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/UserNotFoundException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/exception/ValidationException.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/Booking.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/Category.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/Item.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/Rating.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/RatingType.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/User.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/enums/BookingStatus.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/enums/ItemCondition.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/model/enums/ItemStatus.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/repository/BookingRepository.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/repository/CategoryRepository.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/repository/ItemRepository.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/repository/RatingRepository.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/repository/UserRepository.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/security/JwtAuthenticationFilter.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/security/JwtTokenProvider.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/security/MongoUserDetailsService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/security/MongoUserPrincipal.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/BookingService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/CategoryService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/ImageService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/ItemService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/PasswordService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/RatingService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/UserQueryService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/UserService.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/service/dto/UserStatsDto.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/BookingFactory.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/BookingMapper.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/BookingValidator.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/DateTimeUtil.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/ItemMapper.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/RatingMapper.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/SecurityUtils.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/TrustScoreCalculator.java
-/home/runner/work/locallend/locallend/backend/src/main/java/com/locallend/locallend/util/UserMapper.java
diff --git a/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index 1439199dc585561f0f0740ececeb1c3db106b493..0000000000000000000000000000000000000000
--- a/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-com/locallend/locallend/LocallendApplicationTests.class
diff --git a/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index 5a05ee412ccd808ea5ac29e92be0c80b7102d292..0000000000000000000000000000000000000000
--- a/backend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-/home/runner/work/locallend/locallend/backend/src/test/java/com/locallend/locallend/LocallendApplicationTests.java
diff --git a/backend/target/test-classes/com/locallend/locallend/LocallendApplicationTests.class b/backend/target/test-classes/com/locallend/locallend/LocallendApplicationTests.class
deleted file mode 100644
index e9ec7516950ec107d46fd87d5b7065bd7a5bdacb..0000000000000000000000000000000000000000
Binary files a/backend/target/test-classes/com/locallend/locallend/LocallendApplicationTests.class and /dev/null differ