diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java
index 4e7450f..6ba1e56 100644
--- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java
+++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTestMetricsJobCoreService.java
@@ -1,6 +1,6 @@
 package com.kamco.cd.training.postgres.core;
 
-import com.kamco.cd.training.postgres.repository.schedule.ModelTestMetricsJobRepository;
+import com.kamco.cd.training.postgres.repository.train.ModelTestMetricsJobRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMetricsJobCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMetricsJobCoreService.java
index 3c6c1f2..5692017 100644
--- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMetricsJobCoreService.java
+++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMetricsJobCoreService.java
@@ -1,6 +1,6 @@
 package com.kamco.cd.training.postgres.core;
 
-import com.kamco.cd.training.postgres.repository.schedule.ModelTrainMetricsJobRepository;
+import com.kamco.cd.training.postgres.repository.train.ModelTrainMetricsJobRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
index 2fe22be..c83a4ef 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
@@ -103,7 +103,7 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom {
                 modelHyperParamEntity.gpuCnt,
                 modelHyperParamEntity.learningRate,
                 modelHyperParamEntity.backbone,
-                modelHyperParamEntity.epochCnt,
+                modelConfigEntity.epochCount,
                 modelHyperParamEntity.trainNumWorkers,
                 modelHyperParamEntity.valNumWorkers,
                 modelHyperParamEntity.testNumWorkers,
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepository.java
similarity index 84%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepository.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepository.java
index 48f8e67..d0945fa 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepository.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepository.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import com.kamco.cd.training.postgres.entity.ModelMetricsTestEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryCustom.java
similarity index 81%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryCustom.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryCustom.java
index 5a34eca..bd993e1 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryCustom.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import java.util.List;
 
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
similarity index 97%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryImpl.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
index d30179f..7804c52 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTestMetricsJobRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTestMetricsJobRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import static com.kamco.cd.training.postgres.entity.QModelMasterEntity.modelMasterEntity;
 
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepository.java
similarity index 85%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepository.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepository.java
index 9397e15..2b58eab 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepository.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepository.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import com.kamco.cd.training.postgres.entity.ModelMetricsTrainEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryCustom.java
similarity index 84%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryCustom.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryCustom.java
index 7a8c681..a10caa8 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryCustom.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import java.util.List;
 
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryImpl.java
similarity index 97%
rename from src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryImpl.java
rename to src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryImpl.java
index 78bbda6..c20bc73 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/schedule/ModelTrainMetricsJobRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/train/ModelTrainMetricsJobRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.postgres.repository.schedule;
+package com.kamco.cd.training.postgres.repository.train;
 
 import static com.kamco.cd.training.postgres.entity.QModelMasterEntity.modelMasterEntity;
 
diff --git a/src/main/java/com/kamco/cd/training/schedule/service/ModelTestMetricsJobService.java b/src/main/java/com/kamco/cd/training/train/service/ModelTestMetricsJobService.java
similarity index 98%
rename from src/main/java/com/kamco/cd/training/schedule/service/ModelTestMetricsJobService.java
rename to src/main/java/com/kamco/cd/training/train/service/ModelTestMetricsJobService.java
index 15e5011..c5936bc 100644
--- a/src/main/java/com/kamco/cd/training/schedule/service/ModelTestMetricsJobService.java
+++ b/src/main/java/com/kamco/cd/training/train/service/ModelTestMetricsJobService.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.schedule.service;
+package com.kamco.cd.training.train.service;
 
 import com.kamco.cd.training.postgres.core.ModelTestMetricsJobCoreService;
 import java.io.BufferedReader;
diff --git a/src/main/java/com/kamco/cd/training/schedule/service/ModelTrainMetricsJobService.java b/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
similarity index 98%
rename from src/main/java/com/kamco/cd/training/schedule/service/ModelTrainMetricsJobService.java
rename to src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
index ecb7c27..319a5fd 100644
--- a/src/main/java/com/kamco/cd/training/schedule/service/ModelTrainMetricsJobService.java
+++ b/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
@@ -1,4 +1,4 @@
-package com.kamco.cd.training.schedule.service;
+package com.kamco.cd.training.train.service;
 
 import com.kamco.cd.training.postgres.core.ModelTrainMetricsJobCoreService;
 import java.io.BufferedReader;