moving and reorganizing

src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java

@@ -15,7 +15,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
         "group.goforward.battlbuilder.enrichment"
 })
 @EnableJpaRepositories(basePackages = {
-        "group.goforward.battlbuilder.repos",
+        "group.goforward.battlbuilder.repo",
         "group.goforward.battlbuilder.enrichment"
 })
 public class BattlBuilderApplication {

src/main/java/group/goforward/battlbuilder/catalog/classification/PartRoleResolver.java

@@ -1,7 +1,7 @@
 package group.goforward.battlbuilder.catalog.classification;
 
 import group.goforward.battlbuilder.model.PartRoleRule;
-import group.goforward.battlbuilder.repos.PartRoleRuleRepository;
+import group.goforward.battlbuilder.repo.PartRoleRuleRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/group/goforward/battlbuilder/catalog/classification/PlatformResolver.java

@@ -1,7 +1,7 @@
 package group.goforward.battlbuilder.catalog.classification;
 
 import group.goforward.battlbuilder.model.PlatformRule;
-import group.goforward.battlbuilder.repos.PlatformRuleRepository;
+import group.goforward.battlbuilder.repo.PlatformRuleRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java

@@ -5,8 +5,8 @@ import group.goforward.battlbuilder.classification.ProductClassifier;
 import group.goforward.battlbuilder.model.MerchantCategoryMap;
 import group.goforward.battlbuilder.model.PartRoleSource;
 import group.goforward.battlbuilder.model.Product;
-import group.goforward.battlbuilder.repos.ProductRepository;
-import group.goforward.battlbuilder.repos.ProductOfferRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
+import group.goforward.battlbuilder.repo.ProductOfferRepository;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 

src/main/java/group/goforward/battlbuilder/classification/impl/ProductClassifierImpl.java

@@ -4,8 +4,8 @@ import group.goforward.battlbuilder.classification.ClassificationResult;
 import group.goforward.battlbuilder.classification.ProductClassifier;
 import group.goforward.battlbuilder.model.MerchantCategoryMap;
 import group.goforward.battlbuilder.model.Product;
-import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository;
-import group.goforward.battlbuilder.repos.ProductOfferRepository;
+import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository;
+import group.goforward.battlbuilder.repo.ProductOfferRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;

src/main/java/group/goforward/battlbuilder/cli/BetaInviteCliRunner.java

@@ -1,6 +1,6 @@
 package group.goforward.battlbuilder.cli;
 
-import group.goforward.battlbuilder.services.auth.impl.BetaInviteService;
+import group.goforward.battlbuilder.service.auth.impl.BetaInviteService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

src/main/java/group/goforward/battlbuilder/common/package-info.java

@@ -1,7 +1,7 @@
 /**
- * Utility controllers package for the BattlBuilder application.
+ * Utility controller package for the BattlBuilder application.
  * <p>
- * Contains utility REST controllers for email handling and
+ * Contains utility REST controller for email handling and
  * health check operations.
  * 
  * @author Forward Group, LLC

src/main/java/group/goforward/battlbuilder/config/CacheConfig.java

@@ -12,7 +12,7 @@ public class CacheConfig {
 
     @Bean
     public CacheManager cacheManager() {
-        // Must match the @Cacheable value(s) used in controllers/services.
+        // Must match the @Cacheable value(s) used in controller/service.
         // ProductV1Controller uses: "gunbuilderProductsV1"
         return new ConcurrentMapCacheManager(
                 "gunbuilderProductsV1",

src/main/java/group/goforward/battlbuilder/controller/AuthController.java

@@ -1,9 +1,9 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import group.goforward.battlbuilder.security.JwtService;
-import group.goforward.battlbuilder.services.auth.BetaAuthService;
+import group.goforward.battlbuilder.service.auth.BetaAuthService;
 import group.goforward.battlbuilder.web.dto.auth.AuthResponse;
 import group.goforward.battlbuilder.web.dto.auth.BetaSignupRequest;
 import group.goforward.battlbuilder.web.dto.auth.LoginRequest;

src/main/java/group/goforward/battlbuilder/controller/BuilderBootstrapController.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
 import group.goforward.battlbuilder.model.PartRoleMapping;
-import group.goforward.battlbuilder.repos.PartCategoryRepository;
-import group.goforward.battlbuilder.repos.PartRoleMappingRepository;
+import group.goforward.battlbuilder.repo.PartCategoryRepository;
+import group.goforward.battlbuilder.repo.PartRoleMappingRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/CategoryController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
-import group.goforward.battlbuilder.repos.PartCategoryRepository;
+import group.goforward.battlbuilder.repo.PartCategoryRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/EmailTrackingController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
-import group.goforward.battlbuilder.repos.EmailRequestRepository;
+import group.goforward.battlbuilder.repo.EmailRequestRepository;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/ImportController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
-import group.goforward.battlbuilder.services.MerchantFeedImportService;
+import group.goforward.battlbuilder.service.MerchantFeedImportService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/MerchantDebugController.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
 import group.goforward.battlbuilder.model.Merchant;
-import group.goforward.battlbuilder.repos.MerchantRepository;
+import group.goforward.battlbuilder.repo.MerchantRepository;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/group/goforward/battlbuilder/controller/PartRoleMappingController.java

@@ -1,6 +1,6 @@
-//package group.goforward.battlbuilder.controllers;
+//package group.goforward.battlbuilder.controller;
 //
-//import group.goforward.battlbuilder.services.PartRoleMappingService;
+//import group.goforward.battlbuilder.service.PartRoleMappingService;
 //import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
 //import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
 //import org.springframework.web.bind.annotation.*;

src/main/java/group/goforward/battlbuilder/controller/ProductController.java

@@ -1,7 +1,5 @@
-package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controller;
 
-import group.goforward.battlbuilder.web.dto.ProductOfferDto;
-import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,7 +18,7 @@ import java.util.List;
  * <p>
  * NOTE:
  * Even when disabled, Spring still compiles this class. So it must not reference
- * missing services/methods.
+ * missing service/methods.
  */
 @Deprecated
 @RestController

src/main/java/group/goforward/battlbuilder/controller/admin/AdminBetaInviteController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
-import group.goforward.battlbuilder.services.auth.impl.BetaInviteService;
+import group.goforward.battlbuilder.service.auth.impl.BetaInviteService;
 import group.goforward.battlbuilder.web.dto.admin.AdminBetaRequestDto;
 import group.goforward.battlbuilder.web.dto.admin.AdminInviteResponse;
 import org.springframework.data.domain.Page;

src/main/java/group/goforward/battlbuilder/controller/admin/AdminCategoryController.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
 import group.goforward.battlbuilder.model.PartCategory;
-import group.goforward.battlbuilder.repos.PartCategoryRepository;
+import group.goforward.battlbuilder.repo.PartCategoryRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/admin/AdminDashboardController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
-import group.goforward.battlbuilder.services.admin.impl.AdminDashboardService;
+import group.goforward.battlbuilder.service.admin.impl.AdminDashboardService;
 import group.goforward.battlbuilder.web.dto.admin.AdminDashboardOverviewDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartCategoryController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
-import group.goforward.battlbuilder.repos.PartCategoryRepository;
+import group.goforward.battlbuilder.repo.PartCategoryRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartRoleMappingController.java

@@ -1,9 +1,9 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
 import group.goforward.battlbuilder.model.PartCategory;
 import group.goforward.battlbuilder.model.PartRoleMapping;
-import group.goforward.battlbuilder.repos.PartCategoryRepository;
-import group.goforward.battlbuilder.repos.PartRoleMappingRepository;
+import group.goforward.battlbuilder.repo.PartCategoryRepository;
+import group.goforward.battlbuilder.repo.PartRoleMappingRepository;
 import group.goforward.battlbuilder.web.dto.admin.AdminPartRoleMappingDto;
 import group.goforward.battlbuilder.web.dto.admin.CreatePartRoleMappingRequest;
 import group.goforward.battlbuilder.web.dto.admin.UpdatePartRoleMappingRequest;

src/main/java/group/goforward/battlbuilder/controller/admin/AdminPlatformController.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
 import group.goforward.battlbuilder.model.Platform;
-import group.goforward.battlbuilder.repos.PlatformRepository;
+import group.goforward.battlbuilder.repo.PlatformRepository;
 import group.goforward.battlbuilder.web.dto.admin.PlatformDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/controller/admin/MerchantAdminController.java

@@ -1,5 +1,5 @@
 // MerchantAdminController.java
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import group.goforward.battlbuilder.model.Merchant;
-import group.goforward.battlbuilder.repos.MerchantRepository;
+import group.goforward.battlbuilder.repo.MerchantRepository;
 import group.goforward.battlbuilder.web.dto.MerchantAdminDto;
 
 import java.util.List;

src/main/java/group/goforward/battlbuilder/controller/admin/PlatformViewController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.admin;
+package group.goforward.battlbuilder.controller.admin;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/group/goforward/battlbuilder/controller/admin/package-info.java

@@ -0,0 +1,11 @@
+/**
+ * Admin controller package for the BattlBuilder application.
+ * <p>
+ * Contains REST controller for administrative operations including
+ * category management, platform configuration, and merchant administration.
+ * 
+ * @author Forward Group, LLC
+ * @version 1.0
+ * @since 2025-12-10
+ */
+package group.goforward.battlbuilder.controller.admin;

src/main/java/group/goforward/battlbuilder/controller/api/v1/BrandController.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.Brand;
-import group.goforward.battlbuilder.repos.BrandRepository;
-import group.goforward.battlbuilder.services.BrandService;
+import group.goforward.battlbuilder.repo.BrandRepository;
+import group.goforward.battlbuilder.service.BrandService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildController.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.Build;
-import group.goforward.battlbuilder.repos.BuildRepository;
+import group.goforward.battlbuilder.repo.BuildRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildV1Controller.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
-import group.goforward.battlbuilder.services.BuildService;
+import group.goforward.battlbuilder.service.BuildService;
 import group.goforward.battlbuilder.web.dto.BuildDto;
 import group.goforward.battlbuilder.web.dto.BuildFeedCardDto;
 import group.goforward.battlbuilder.web.dto.BuildSummaryDto;

src/main/java/group/goforward/battlbuilder/controller/api/v1/CatalogController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
-import group.goforward.battlbuilder.services.CatalogQueryService;
+import group.goforward.battlbuilder.service.CatalogQueryService;
 import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
 import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest;
 

src/main/java/group/goforward/battlbuilder/controller/api/v1/EmailController.java

@@ -1,11 +1,11 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.common.ApiResponse;
 import group.goforward.battlbuilder.dto.EmailRequestDto;
 import group.goforward.battlbuilder.model.EmailRequest;
 import group.goforward.battlbuilder.model.EmailStatus;
-import group.goforward.battlbuilder.repos.EmailRequestRepository;
-import group.goforward.battlbuilder.services.utils.EmailService;
+import group.goforward.battlbuilder.repo.EmailRequestRepository;
+import group.goforward.battlbuilder.service.utils.EmailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/controller/api/v1/ImageController.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.ImageMeta;
 import group.goforward.battlbuilder.security.UserPrincipal;
-import group.goforward.battlbuilder.services.impl.ImageService;
+import group.goforward.battlbuilder.service.impl.ImageService;
 import org.springframework.http.CacheControl;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/controller/api/v1/MeController.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/group/goforward/battlbuilder/controller/api/v1/ProductV1Controller.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
-import group.goforward.battlbuilder.services.ProductQueryService;
+import group.goforward.battlbuilder.service.ProductQueryService;
 import group.goforward.battlbuilder.web.dto.ProductOfferDto;
 import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
 import org.springframework.cache.annotation.Cacheable;

src/main/java/group/goforward/battlbuilder/controller/api/v1/StateController.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.State;
-import group.goforward.battlbuilder.repos.StateRepository;
-import group.goforward.battlbuilder.services.admin.StatesService;
+import group.goforward.battlbuilder.repo.StateRepository;
+import group.goforward.battlbuilder.service.admin.StatesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/controller/api/v1/UserController.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controller.api.v1;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
-import group.goforward.battlbuilder.services.admin.UsersService;
+import group.goforward.battlbuilder.repo.UserRepository;
+import group.goforward.battlbuilder.service.admin.UsersService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/group/goforward/battlbuilder/controller/api/v1/package-info.java

@@ -0,0 +1,11 @@
+/**
+ * API controller package for the BattlBuilder application.
+ * <p>
+ * Contains REST API controller for public-facing endpoints including
+ * brand management, state information, and user operations.
+ * 
+ * @author Forward Group, LLC
+ * @version 1.0
+ * @since 2025-12-10
+ */
+package group.goforward.battlbuilder.controller.api.v1;

src/main/java/group/goforward/battlbuilder/controller/package-info.java

@@ -0,0 +1,11 @@
+/**
+ * Utility controller package for the BattlBuilder application.
+ * <p>
+ * Contains utility REST controller for email handling and
+ * health check operations.
+ *
+ * @author Forward Group, LLC
+ * @version 1.0
+ * @since 2025-12-10
+ */
+package group.goforward.battlbuilder.controller;

src/main/java/group/goforward/battlbuilder/controllers/admin/package-info.java

@@ -1,11 +0,0 @@
-/**
- * Admin controllers package for the BattlBuilder application.
- * <p>
- * Contains REST controllers for administrative operations including
- * category management, platform configuration, and merchant administration.
- * 
- * @author Forward Group, LLC
- * @version 1.0
- * @since 2025-12-10
- */
-package group.goforward.battlbuilder.controllers.admin;

src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java

@@ -1,11 +0,0 @@
-/**
- * API controllers package for the BattlBuilder application.
- * <p>
- * Contains REST API controllers for public-facing endpoints including
- * brand management, state information, and user operations.
- * 
- * @author Forward Group, LLC
- * @version 1.0
- * @since 2025-12-10
- */
-package group.goforward.battlbuilder.controllers.api.v1;

src/main/java/group/goforward/battlbuilder/controllers/package-info.java

@@ -1,11 +0,0 @@
-/**
- * Utility controllers package for the BattlBuilder application.
- * <p>
- * Contains utility REST controllers for email handling and
- * health check operations.
- *
- * @author Forward Group, LLC
- * @version 1.0
- * @since 2025-12-10
- */
-package group.goforward.battlbuilder.controllers;

src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentSource.java

@@ -1,5 +1,8 @@
 package group.goforward.battlbuilder.enrichment;
 
+/**
+ * Enum representing the source of an enrichment.
+ */
 public enum EnrichmentSource {
     AI,
     RULES,

src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentStatus.java

@@ -1,4 +1,15 @@
 package group.goforward.battlbuilder.enrichment;
+/**
+ * Status of an enrichment in the system.
+ *
+ * <p>Possible values:
+ * <ul>
+ *   <li>PENDING_REVIEW - awaiting review</li>
+ *   <li>APPROVED - approved to apply</li>
+ *   <li>REJECTED - rejected and will not be applied</li>
+ *   <li>APPLIED - enrichment has been applied</li>
+ * </ul>
+ */
 
 public enum EnrichmentStatus {
     PENDING_REVIEW,

src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentType.java

@@ -1,5 +1,8 @@
 package group.goforward.battlbuilder.enrichment;
 
+/**
+ * Enum representing different types of enrichment that can be applied to products.
+ */
 public enum EnrichmentType {
     CALIBER,
     CALIBER_GROUP,

src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java

@@ -2,11 +2,11 @@ package group.goforward.battlbuilder.enrichment.ai;
 
 import group.goforward.battlbuilder.enrichment.*;
 import group.goforward.battlbuilder.enrichment.ai.dto.CaliberExtractionResult;
-import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
-import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository;
+import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
+import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
 import group.goforward.battlbuilder.enrichment.taxonomies.CaliberTaxonomy;
 import group.goforward.battlbuilder.model.Product;
-import group.goforward.battlbuilder.repos.ProductRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

src/main/java/group/goforward/battlbuilder/enrichment/controller/AdminEnrichmentController.java

@@ -1,12 +1,12 @@
-package group.goforward.battlbuilder.enrichment.controllers;
+package group.goforward.battlbuilder.enrichment.controller;
 
 import group.goforward.battlbuilder.enrichment.taxonomies.CaliberTaxonomy;
 import group.goforward.battlbuilder.enrichment.EnrichmentStatus;
 import group.goforward.battlbuilder.enrichment.EnrichmentType;
-import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
+import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
 import group.goforward.battlbuilder.enrichment.ai.AiEnrichmentOrchestrator;
-import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository;
-import group.goforward.battlbuilder.enrichment.services.CaliberEnrichmentService;
+import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
+import group.goforward.battlbuilder.enrichment.service.CaliberEnrichmentService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/group/goforward/battlbuilder/enrichment/model/ProductEnrichment.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.enrichment.models;
+package group.goforward.battlbuilder.enrichment.model;
 
 import group.goforward.battlbuilder.enrichment.EnrichmentSource;
 import group.goforward.battlbuilder.enrichment.EnrichmentStatus;

src/main/java/group/goforward/battlbuilder/enrichment/repo/ProductEnrichmentRepository.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.enrichment.repos;
+package group.goforward.battlbuilder.enrichment.repo;
 
 import group.goforward.battlbuilder.enrichment.EnrichmentStatus;
 import group.goforward.battlbuilder.enrichment.EnrichmentType;
-import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
+import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/group/goforward/battlbuilder/enrichment/service/CaliberEnrichmentService.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.enrichment.services;
+package group.goforward.battlbuilder.enrichment.service;
 
 import group.goforward.battlbuilder.enrichment.*;
-import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
-import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository;
+import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
+import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import org.springframework.stereotype.Service;

src/main/java/group/goforward/battlbuilder/repo/AccountRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.Account;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/AuthTokenRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.AuthToken;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/BrandRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 import group.goforward.battlbuilder.model.Brand;
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.Optional;

src/main/java/group/goforward/battlbuilder/repo/BuildItemRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.BuildItem;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/BuildProfileRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.BuildProfile;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/BuildRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.Build;
 import org.springframework.data.domain.Page;

src/main/java/group/goforward/battlbuilder/repo/CanonicalCategoryRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.CanonicalCategory;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/CategoryMappingRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.CategoryMapping;
 import group.goforward.battlbuilder.model.Merchant;

src/main/java/group/goforward/battlbuilder/repo/EmailRequestRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.EmailRequest;
 import group.goforward.battlbuilder.model.EmailStatus;

src/main/java/group/goforward/battlbuilder/repo/EmailTemplateRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.EmailTemplate;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/FeedImportRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.FeedImport;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/ImageBlobRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.ImageBlob;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/ImageMetaRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.ImageMeta;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/MerchantCategoryMapRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.MerchantCategoryMap;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/MerchantRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.Merchant;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PartCategoryRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.PartCategory;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PartRoleMappingRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.PartRoleMapping;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PartRoleRuleRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.PartRoleRule;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PlatformRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.Platform;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PlatformRuleRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.PlatformRule;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/PriceHistoryRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.PriceHistory;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/ProductOfferRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.ProductOffer;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/ProductRepository.java

@@ -1,10 +1,10 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.ImportStatus;
 import group.goforward.battlbuilder.model.Brand;
 import group.goforward.battlbuilder.model.Product;
 
-import group.goforward.battlbuilder.repos.projections.CatalogRow;
+import group.goforward.battlbuilder.repo.projections.CatalogRow;
 import group.goforward.battlbuilder.web.dto.catalog.CatalogOptionRow;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/group/goforward/battlbuilder/repo/StateRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.State;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/UserRepository.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;
 
 import group.goforward.battlbuilder.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/group/goforward/battlbuilder/repo/catalog/spec/CatalogProductSpecifications.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos.catalog.spec;
+package group.goforward.battlbuilder.repo.catalog.spec;
 
 import group.goforward.battlbuilder.model.Product;
 import group.goforward.battlbuilder.model.ProductStatus;

src/main/java/group/goforward/battlbuilder/repo/package-info.java

@@ -8,4 +8,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.repos;
+package group.goforward.battlbuilder.repo;

src/main/java/group/goforward/battlbuilder/repo/projections/CatalogRow.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.repos.projections;
+package group.goforward.battlbuilder.repo.projections;
 
 public interface CatalogRow {
     Long getId();

src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java

@@ -1,7 +1,7 @@
 package group.goforward.battlbuilder.security;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java

@@ -1,7 +1,7 @@
 package group.goforward.battlbuilder.security;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/group/goforward/battlbuilder/service/BrandService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.Brand;
 

src/main/java/group/goforward/battlbuilder/service/BuildService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.web.dto.BuildDto;
 import group.goforward.battlbuilder.web.dto.BuildFeedCardDto;

src/main/java/group/goforward/battlbuilder/service/BuildsService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import aj.org.objectweb.asm.commons.Remapper;
 import group.goforward.battlbuilder.model.Brand;

src/main/java/group/goforward/battlbuilder/service/CatalogQueryService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
 import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest;

src/main/java/group/goforward/battlbuilder/service/CategoryClassificationService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.imports.MerchantFeedRow;
 import group.goforward.battlbuilder.model.Merchant;

src/main/java/group/goforward/battlbuilder/service/CategoryMappingRecommendationService.java

@@ -1,8 +1,8 @@
-// src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java
-package group.goforward.battlbuilder.services;
+// src/main/java/group/goforward/ballistic/service/CategoryMappingRecommendationService.java
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.Product;
-import group.goforward.battlbuilder.repos.ProductRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
 import group.goforward.battlbuilder.web.dto.CategoryMappingRecommendationDto;
 import org.springframework.stereotype.Service;
 

src/main/java/group/goforward/battlbuilder/service/CurrentUserService.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;

src/main/java/group/goforward/battlbuilder/service/ImportStatusAdminService.java

@@ -1,8 +1,8 @@
-// src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java
-package group.goforward.battlbuilder.services;
+// src/main/java/group/goforward/ballistic/service/ImportStatusAdminService.java
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.ImportStatus;
-import group.goforward.battlbuilder.repos.ProductRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
 import group.goforward.battlbuilder.web.dto.ImportStatusByMerchantDto;
 import group.goforward.battlbuilder.web.dto.ImportStatusSummaryDto;
 import org.springframework.stereotype.Service;

src/main/java/group/goforward/battlbuilder/service/MappingAdminService.java

@@ -1,13 +1,13 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.ImportStatus;
 import group.goforward.battlbuilder.model.Merchant;
 import group.goforward.battlbuilder.model.MerchantCategoryMap;
 import group.goforward.battlbuilder.model.CanonicalCategory;
-import group.goforward.battlbuilder.repos.CanonicalCategoryRepository;
-import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository;
-import group.goforward.battlbuilder.repos.MerchantRepository;
-import group.goforward.battlbuilder.repos.ProductRepository;
+import group.goforward.battlbuilder.repo.CanonicalCategoryRepository;
+import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository;
+import group.goforward.battlbuilder.repo.MerchantRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
 import group.goforward.battlbuilder.web.dto.MappingOptionsDto;
 import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto;
 import group.goforward.battlbuilder.web.dto.RawCategoryMappingRowDto;

src/main/java/group/goforward/battlbuilder/service/MerchantFeedImportService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 public interface MerchantFeedImportService {
 

src/main/java/group/goforward/battlbuilder/service/PartCategoryResolverService.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.model.PartCategory;
 import group.goforward.battlbuilder.model.PartRoleMapping;
-import group.goforward.battlbuilder.repos.PartRoleMappingRepository;
+import group.goforward.battlbuilder.repo.PartRoleMappingRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;

src/main/java/group/goforward/battlbuilder/service/PartRoleMappingService.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
-import group.goforward.battlbuilder.repos.PartRoleMappingRepository;
+import group.goforward.battlbuilder.repo.PartRoleMappingRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
 import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
 import group.goforward.battlbuilder.web.mapper.PartRoleMappingMapper;

src/main/java/group/goforward/battlbuilder/service/ProductQueryService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 import group.goforward.battlbuilder.web.dto.ProductOfferDto;
 import group.goforward.battlbuilder.web.dto.ProductSummaryDto;

src/main/java/group/goforward/battlbuilder/service/ReclassificationService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services;
+package group.goforward.battlbuilder.service;
 
 public interface ReclassificationService {
     int reclassifyPendingForMerchant(Integer merchantId);

src/main/java/group/goforward/battlbuilder/service/admin/AdminProductService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services.admin;
+package group.goforward.battlbuilder.service.admin;
 
 import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest;
 import group.goforward.battlbuilder.web.dto.admin.ProductAdminRowDto;

src/main/java/group/goforward/battlbuilder/service/admin/AdminUserService.java

@@ -1,7 +1,7 @@
-package group.goforward.battlbuilder.services.admin;
+package group.goforward.battlbuilder.service.admin;
 
 import group.goforward.battlbuilder.model.User;
-import group.goforward.battlbuilder.repos.UserRepository;
+import group.goforward.battlbuilder.repo.UserRepository;
 import group.goforward.battlbuilder.web.dto.admin.AdminUserDto;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;

src/main/java/group/goforward/battlbuilder/service/admin/StatesService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services.admin;
+package group.goforward.battlbuilder.service.admin;
 
 import group.goforward.battlbuilder.model.State;
 

src/main/java/group/goforward/battlbuilder/service/admin/UsersService.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.services.admin;
+package group.goforward.battlbuilder.service.admin;
 
 import group.goforward.battlbuilder.model.User;
 

src/main/java/group/goforward/battlbuilder/service/admin/admin_services_package_info.java

@@ -1,5 +1,5 @@
 /**
- * Admin services package for the BattlBuilder application.
+ * Admin service package for the BattlBuilder application.
  * <p>
  * Contains service classes for administrative business logic
  * and operations.
@@ -8,4 +8,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.services.admin;
+package group.goforward.battlbuilder.service.admin;

src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminDashboardService.java

@@ -1,9 +1,9 @@
-package group.goforward.battlbuilder.services.admin.impl;
+package group.goforward.battlbuilder.service.admin.impl;
 
 import group.goforward.battlbuilder.model.ImportStatus;
-import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository;
-import group.goforward.battlbuilder.repos.MerchantRepository;
-import group.goforward.battlbuilder.repos.ProductRepository;
+import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository;
+import group.goforward.battlbuilder.repo.MerchantRepository;
+import group.goforward.battlbuilder.repo.ProductRepository;
 import group.goforward.battlbuilder.web.dto.admin.AdminDashboardOverviewDto;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminProductServiceImpl.java

@@ -1,8 +1,8 @@
-package group.goforward.battlbuilder.services.admin.impl;
+package group.goforward.battlbuilder.service.admin.impl;
 
 import group.goforward.battlbuilder.model.Product;
-import group.goforward.battlbuilder.repos.ProductRepository;
-import group.goforward.battlbuilder.services.admin.AdminProductService;
+import group.goforward.battlbuilder.repo.ProductRepository;
+import group.goforward.battlbuilder.service.admin.AdminProductService;
 import group.goforward.battlbuilder.specs.ProductSpecifications;
 import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest;
 import group.goforward.battlbuilder.web.dto.admin.ProductAdminRowDto;

src/main/java/group/goforward/battlbuilder/service/admin/impl/StatesServiceImpl.java

@@ -1,9 +1,9 @@
-package group.goforward.battlbuilder.services.admin.impl;
+package group.goforward.battlbuilder.service.admin.impl;
 
 
 import group.goforward.battlbuilder.model.State;
-import group.goforward.battlbuilder.repos.StateRepository;
-import group.goforward.battlbuilder.services.admin.StatesService;
+import group.goforward.battlbuilder.repo.StateRepository;
+import group.goforward.battlbuilder.service.admin.StatesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;