diff --git a/src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java b/src/main/java/group/goforward/battlbuilder/config/Password2Config.java
similarity index 80%
rename from src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java
rename to src/main/java/group/goforward/battlbuilder/config/Password2Config.java
index 7533c48..c69bfd1 100644
--- a/src/main/java/group/goforward/battlbuilder/config/PasswordConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/Password2Config.java
@@ -1,5 +1,4 @@
-/*
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -7,11 +6,11 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
- public class PasswordConfig {
+ public class Password2Config {
 
-     @Bean
+   //  @Bean
      public PasswordEncoder passwordEncoder() {
 //         // BCrypt default password
          return new BCryptPasswordEncoder();
      }
- }*/
+ }
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
index 485d203..7de2408 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java
@@ -1,31 +1,31 @@
-//package group.goforward.battlbuilder.controllers;
+package group.goforward.battlbuilder.controllers;
 //
-//import group.goforward.battlbuilder.services.PartRoleMappingService;
-//import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
-//import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
-//import org.springframework.web.bind.annotation.*;
+import group.goforward.battlbuilder.services.PartRoleMappingService;
+import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
+import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 //
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping({"/api/part-role-mappings", "/api/v1/part-role-mappings"})
-//public class PartRoleMappingController {
-//
-//    private final PartRoleMappingService service;
-//
-//    public PartRoleMappingController(PartRoleMappingService service) {
-//        this.service = service;
-//    }
-//
-//    // Full view for admin UI
-//    @GetMapping("/{platform}")
-//    public List<PartRoleMappingDto> getMappings(@PathVariable String platform) {
-//        return service.getMappingsForPlatform(platform);
-//    }
-//
-//    // Thin mapping for the builder
-//    @GetMapping("/{platform}/map")
-//    public List<PartRoleToCategoryDto> getRoleMap(@PathVariable String platform) {
-//        return service.getRoleToCategoryMap(platform);
-//    }
-//}
\ No newline at end of file
+@RestController
+@RequestMapping({"/api/part-role-mappings", "/api/v1/part-role-mappings"})
+public class PartRoleMappingController {
+
+    private final PartRoleMappingService service;
+
+    public PartRoleMappingController(PartRoleMappingService service) {
+        this.service = service;
+    }
+
+    // Full view for admin UI
+    @GetMapping("/{platform}")
+    public List<PartRoleMappingDto> getMappings(@PathVariable String platform) {
+        return service.getMappingsForPlatform(platform);
+    }
+
+    // Thin mapping for the builder
+    @GetMapping("/{platform}/map")
+    public List<PartRoleToCategoryDto> getRoleMap(@PathVariable String platform) {
+        return service.getRoleToCategoryMap(platform);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/group/goforward/battlbuilder/model/EmailRequest.java b/src/main/java/group/goforward/battlbuilder/model/EmailRequest.java
index 8573df6..71883ba 100644
--- a/src/main/java/group/goforward/battlbuilder/model/EmailRequest.java
+++ b/src/main/java/group/goforward/battlbuilder/model/EmailRequest.java
@@ -10,15 +10,15 @@ import java.time.LocalDateTime;
 @NamedQueries({
         @NamedQuery(
                 name = "EmailRequest.findSent",
-                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.SENT"
+                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.SENT"
         ),
         @NamedQuery(
                 name = "EmailRequest.findFailed",
-                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.FAILED"
+                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.FAILED"
         ),
         @NamedQuery(
                 name = "EmailRequest.findPending",
-                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.EmailStatus.PENDING"
+                query = "SELECT e FROM EmailRequest e WHERE e.status = group.goforward.battlbuilder.model.enums.EmailStatus.PENDING"
         )
 })
 public class EmailRequest {
diff --git a/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java
index 8e0b3e4..c37308d 100644
--- a/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java
+++ b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java
@@ -9,7 +9,7 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 
 @Entity
-@Table(name = "merchant_category_map")
+@Table(name = "merchant_category_map", schema = "public")
 public class MerchantCategoryMap {
 
     @Id
diff --git a/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java b/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java
index c8b5cac..c3e842c 100644
--- a/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java
+++ b/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java
@@ -377,7 +377,7 @@ where po.product_id = p.id
             JOIN p.offers o
             JOIN o.merchant m
             WHERE p.deletedAt IS NULL
-              AND (p.importStatus = group.goforward.battlbuilder.model.ImportStatus.PENDING_MAPPING
+              AND (p.importStatus = group.goforward.battlbuilder.model.enums.ImportStatus.PENDING_MAPPING
                    OR p.partRole IS NULL
                    OR LOWER(p.partRole) = 'unknown')
               AND p.rawCategoryKey IS NOT NULL
@@ -458,7 +458,7 @@ ORDER BY productCount DESC
     FROM Product p
     JOIN p.offers o
     WHERE o.merchant.id = :merchantId
-      AND p.importStatus = group.goforward.battlbuilder.model.ImportStatus.PENDING_MAPPING
+      AND p.importStatus = group.goforward.battlbuilder.model.enums.ImportStatus.PENDING_MAPPING
       AND p.deletedAt IS NULL
     """)
     List<Product> findPendingMappingByMerchantId(@Param("merchantId") Integer merchantId);
diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java
index 401b49a..33f6b48 100644
--- a/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java
+++ b/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java
@@ -4,7 +4,7 @@ import group.goforward.battlbuilder.model.Product;
 import group.goforward.battlbuilder.model.ProductOffer;
 import group.goforward.battlbuilder.repos.ProductOfferRepository;
 import group.goforward.battlbuilder.repos.ProductRepository;
-import group.goforward.battlbuilder.repos.spec.CatalogProductSpecifications;
+import group.goforward.battlbuilder.repos.catalog.spec.CatalogProductSpecifications;
 import group.goforward.battlbuilder.services.CatalogQueryService;
 import group.goforward.battlbuilder.services.ShortLinkService;
 import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;