diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 38beb6c..109ac0b 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -1,6 +1,6 @@
 # Stage 1: Build the application (The Build Stage)
 # Use a Java SDK image with Maven pre-installed
-FROM maven:3.9-jdk-17-slim AS build
+FROM maven:3.9-jdk-21-slim AS build
 
 # Set the working directory inside the container
 WORKDIR /app
@@ -17,7 +17,7 @@ RUN mvn clean package -DskipTests
 
 # Stage 2: Create the final lightweight image (The Runtime Stage)
 # Use a smaller Java Runtime Environment (JRE) image for a smaller footprint
-FROM openjdk:17-jre-slim
+FROM openjdk:21
 
 # Set the working directory in the final image
 WORKDIR /app
diff --git a/docker/compose.yaml b/docker/compose.yaml
deleted file mode 100644
index 88efb6d..0000000
--- a/docker/compose.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-services:
-  postgres:
-    image: 'postgres:latest'
-    environment:
-      - 'POSTGRES_DB=mydatabase'
-      - 'POSTGRES_PASSWORD=secret'
-      - 'POSTGRES_USER=myuser'
-    ports:
-      - '5432'
diff --git a/src/main/java/group/goforward/battlbuilder/utils/ApiResponse.java b/src/main/java/group/goforward/battlbuilder/common/ApiResponse.java
similarity index 93%
rename from src/main/java/group/goforward/battlbuilder/utils/ApiResponse.java
rename to src/main/java/group/goforward/battlbuilder/common/ApiResponse.java
index 22fd2b7..24857d8 100644
--- a/src/main/java/group/goforward/battlbuilder/utils/ApiResponse.java
+++ b/src/main/java/group/goforward/battlbuilder/common/ApiResponse.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.utils;
+package group.goforward.battlbuilder.common;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/group/goforward/battlbuilder/utils/Counter.java b/src/main/java/group/goforward/battlbuilder/common/Counter.java
similarity index 67%
rename from src/main/java/group/goforward/battlbuilder/utils/Counter.java
rename to src/main/java/group/goforward/battlbuilder/common/Counter.java
index 6836ed8..cd7d306 100644
--- a/src/main/java/group/goforward/battlbuilder/utils/Counter.java
+++ b/src/main/java/group/goforward/battlbuilder/common/Counter.java
@@ -1,6 +1,4 @@
-package group.goforward.battlbuilder.utils;
-
-import org.springframework.context.annotation.Bean;
+package group.goforward.battlbuilder.common;
 
 public class Counter {
 
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java b/src/main/java/group/goforward/battlbuilder/common/PingController.java
similarity index 78%
rename from src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java
rename to src/main/java/group/goforward/battlbuilder/common/PingController.java
index 19806ce..efe9a15 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java
+++ b/src/main/java/group/goforward/battlbuilder/common/PingController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.utils;
+package group.goforward.battlbuilder.common;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/utils/package-info.java b/src/main/java/group/goforward/battlbuilder/common/package-info.java
similarity index 81%
rename from src/main/java/group/goforward/battlbuilder/controllers/utils/package-info.java
rename to src/main/java/group/goforward/battlbuilder/common/package-info.java
index 9d15485..652b139 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/utils/package-info.java
+++ b/src/main/java/group/goforward/battlbuilder/common/package-info.java
@@ -8,4 +8,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.controllers.utils;
+package group.goforward.battlbuilder.common;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java b/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java
similarity index 90%
rename from src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/CacheConfig.java
index 770c0ef..02eac29 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
similarity index 95%
rename from src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
index 20ff722..d923961 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
@@ -1,5 +1,5 @@
 // src/main/java/com/example/config/CorsConfig.java
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java b/src/main/java/group/goforward/battlbuilder/config/JpaConfig.java
similarity index 79%
rename from src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/JpaConfig.java
index eca843f..6429d31 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/JpaConfig.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.context.annotation.Configuration;
 //import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/MinioConfig.java b/src/main/java/group/goforward/battlbuilder/config/MinioConfig.java
similarity index 92%
rename from src/main/java/group/goforward/battlbuilder/configuration/MinioConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/MinioConfig.java
index 0e99720..0fdbc86 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/MinioConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/MinioConfig.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import io.minio.MinioClient;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java b/src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
similarity index 98%
rename from src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
index 4f6d62f..7cfdd54 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import group.goforward.battlbuilder.security.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/group/goforward/battlbuilder/configuration/package-info.java b/src/main/java/group/goforward/battlbuilder/config/package-info.java
similarity index 82%
rename from src/main/java/group/goforward/battlbuilder/configuration/package-info.java
rename to src/main/java/group/goforward/battlbuilder/config/package-info.java
index a640798..cd02eb5 100644
--- a/src/main/java/group/goforward/battlbuilder/configuration/package-info.java
+++ b/src/main/java/group/goforward/battlbuilder/config/package-info.java
@@ -8,4 +8,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java
similarity index 93%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java
index 8da32a3..68f6ea1 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.Brand;
 import group.goforward.battlbuilder.repos.BrandRepository;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java
similarity index 91%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java
index 11b3f0b..2c06ee7 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/BuildController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.Build;
 import group.goforward.battlbuilder.repos.BuildRepository;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/BuildV1Controller.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java
similarity index 98%
rename from src/main/java/group/goforward/battlbuilder/controllers/BuildV1Controller.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java
index bff7978..3b9826c 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/BuildV1Controller.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.services.BuildService;
 import group.goforward.battlbuilder.web.dto.BuildDto;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/CatalogController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java
similarity index 97%
rename from src/main/java/group/goforward/battlbuilder/controllers/CatalogController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java
index 8abdafe..5b38310 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/CatalogController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.services.CatalogQueryService;
 import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/EmailController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java
similarity index 98%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/EmailController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java
index e52ff32..68d5523 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/EmailController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java
@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
-import group.goforward.battlbuilder.utils.ApiResponse;
+import group.goforward.battlbuilder.common.ApiResponse;
 import group.goforward.battlbuilder.dto.EmailRequestDto;
 import group.goforward.battlbuilder.model.EmailRequest;
 import group.goforward.battlbuilder.model.EmailStatus;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java
similarity index 94%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java
index 9db5bfd..d1dc29a 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/ImageController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.ImageMeta;
 import group.goforward.battlbuilder.security.UserPrincipal;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java
similarity index 99%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java
index e901ef2..fb841ac 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/MeController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.User;
 import group.goforward.battlbuilder.repos.UserRepository;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/ProductV1Controller.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java
similarity index 97%
rename from src/main/java/group/goforward/battlbuilder/controllers/ProductV1Controller.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java
index 7d4fa23..f5d9d08 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/ProductV1Controller.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.services.ProductQueryService;
 import group.goforward.battlbuilder.web.dto.ProductOfferDto;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java
similarity index 94%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java
index 5dd7c14..53ff7c0 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.State;
 import group.goforward.battlbuilder.repos.StateRepository;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java
similarity index 93%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java
index 646dab4..1e9c863 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.User;
 import group.goforward.battlbuilder.repos.UserRepository;
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/package-info.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java
similarity index 83%
rename from src/main/java/group/goforward/battlbuilder/controllers/api/package-info.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java
index 781f23b..443848d 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/package-info.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java
@@ -8,4 +8,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/Snippet.java b/src/main/java/group/goforward/battlbuilder/services/utils/Snippet.java
deleted file mode 100644
index 88305b6..0000000
--- a/src/main/java/group/goforward/battlbuilder/services/utils/Snippet.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Services package for the BattlBuilder application.
- * <p>
- * Contains business logic service classes for product management,
- * category classification, mapping recommendations, and merchant operations.
- * 
- * @author Forward Group, LLC
- * @version 1.0
- * @since 2025-12-10
- */
-package group.goforward.battlbuilder.services.utils;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 86e261e..8e87418 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -71,3 +71,6 @@ app.beta.invite.tokenMinutes=30
 ai.minConfidence=0.75
 ai.openai.apiKey=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
 ai.openai.model=gpt-4.1-mini
+
+# application.properties
+spring.jpa.properties.hibernate.transaction.jta.platform=org.hibernate.engine.transaction.jta.platform.internal.NoopJtaPlatform
\ No newline at end of file