diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index be4fa49..13df110 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -14,6 +14,8 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://r710.dev.gofwd.group:5433/ss_builder
       - SPRING_DATASOURCE_USERNAME=dba
       - SPRING_DATASOURCE_PASSWORD=!@#Qwerty
+      - SPRING_PROFILES_ACTIVE=openai
+
     networks:
       - app-network
 
diff --git a/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java
index b190dda..d881b7d 100644
--- a/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java
+++ b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java
@@ -4,10 +4,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 @EnableCaching
+@ComponentScan(basePackages = "group.goforward")
 @EntityScan(basePackages = {
         "group.goforward.battlbuilder.model",
         "group.goforward.battlbuilder.enrichment"
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java
index f5b4be4..432c1bb 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java
@@ -2,6 +2,9 @@ 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.taxonomies.CaliberTaxonomy;
 import group.goforward.battlbuilder.model.Product;
 import group.goforward.battlbuilder.repos.ProductRepository;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/AdminEnrichmentController.java b/src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java
similarity index 92%
rename from src/main/java/group/goforward/battlbuilder/enrichment/AdminEnrichmentController.java
rename to src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java
index 8b1f313..97a94f0 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/AdminEnrichmentController.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java
@@ -1,6 +1,12 @@
-package group.goforward.battlbuilder.enrichment;
+package group.goforward.battlbuilder.enrichment.controllers;
 
+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.ai.AiEnrichmentOrchestrator;
+import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository;
+import group.goforward.battlbuilder.enrichment.services.CaliberEnrichmentService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichment.java b/src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java
similarity index 93%
rename from src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichment.java
rename to src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java
index 1520a61..cd82318 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichment.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java
@@ -1,5 +1,8 @@
-package group.goforward.battlbuilder.enrichment;
+package group.goforward.battlbuilder.enrichment.models;
 
+import group.goforward.battlbuilder.enrichment.EnrichmentSource;
+import group.goforward.battlbuilder.enrichment.EnrichmentStatus;
+import group.goforward.battlbuilder.enrichment.EnrichmentType;
 import jakarta.persistence.*;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichmentRepository.java b/src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java
similarity index 91%
rename from src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichmentRepository.java
rename to src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java
index 051c2a8..1b2eda5 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/ProductEnrichmentRepository.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java
@@ -1,5 +1,8 @@
-package group.goforward.battlbuilder.enrichment;
+package group.goforward.battlbuilder.enrichment.repos;
 
+import group.goforward.battlbuilder.enrichment.EnrichmentStatus;
+import group.goforward.battlbuilder.enrichment.EnrichmentType;
+import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/CaliberEnrichmentService.java b/src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java
similarity index 91%
rename from src/main/java/group/goforward/battlbuilder/enrichment/CaliberEnrichmentService.java
rename to src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java
index c8f959d..5e5d3f3 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/CaliberEnrichmentService.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java
@@ -1,5 +1,8 @@
-package group.goforward.battlbuilder.enrichment;
+package group.goforward.battlbuilder.enrichment.services;
 
+import group.goforward.battlbuilder.enrichment.*;
+import group.goforward.battlbuilder.enrichment.models.ProductEnrichment;
+import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/CaliberTaxonomy.java b/src/main/java/group/goforward/battlbuilder/enrichment/taxonomies/CaliberTaxonomy.java
similarity index 95%
rename from src/main/java/group/goforward/battlbuilder/enrichment/CaliberTaxonomy.java
rename to src/main/java/group/goforward/battlbuilder/enrichment/taxonomies/CaliberTaxonomy.java
index 0a27566..eb4d17f 100644
--- a/src/main/java/group/goforward/battlbuilder/enrichment/CaliberTaxonomy.java
+++ b/src/main/java/group/goforward/battlbuilder/enrichment/taxonomies/CaliberTaxonomy.java
@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.enrichment;
+package group.goforward.battlbuilder.enrichment.taxonomies;
 
 import java.util.Locale;