diff --git a/health-services/plan-service/src/main/java/digit/service/PlanService.java b/health-services/plan-service/src/main/java/digit/service/PlanService.java
index 4acaf58218..dad7e8b7d8 100644
--- a/health-services/plan-service/src/main/java/digit/service/PlanService.java
+++ b/health-services/plan-service/src/main/java/digit/service/PlanService.java
@@ -1,13 +1,13 @@
 package digit.service;
 
 import digit.repository.PlanRepository;
+import digit.service.enrichment.PlanEnricher;
+import digit.service.validator.PlanValidator;
 import digit.service.workflow.WorkflowService;
 import digit.web.models.*;
-import org.egov.common.contract.response.ResponseInfo;
 import org.egov.common.utils.ResponseInfoUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
diff --git a/health-services/plan-service/src/main/java/digit/service/PlanEnricher.java b/health-services/plan-service/src/main/java/digit/service/enrichment/PlanEnricher.java
similarity index 99%
rename from health-services/plan-service/src/main/java/digit/service/PlanEnricher.java
rename to health-services/plan-service/src/main/java/digit/service/enrichment/PlanEnricher.java
index b01c78ea82..17364bfdb6 100644
--- a/health-services/plan-service/src/main/java/digit/service/PlanEnricher.java
+++ b/health-services/plan-service/src/main/java/digit/service/enrichment/PlanEnricher.java
@@ -1,4 +1,4 @@
-package digit.service;
+package digit.service.enrichment;
 
 import digit.web.models.Plan;
 import digit.web.models.PlanRequest;
diff --git a/health-services/plan-service/src/main/java/digit/service/PlanValidator.java b/health-services/plan-service/src/main/java/digit/service/validator/PlanValidator.java
similarity index 99%
rename from health-services/plan-service/src/main/java/digit/service/PlanValidator.java
rename to health-services/plan-service/src/main/java/digit/service/validator/PlanValidator.java
index aa1656c00b..1fd98c823b 100644
--- a/health-services/plan-service/src/main/java/digit/service/PlanValidator.java
+++ b/health-services/plan-service/src/main/java/digit/service/validator/PlanValidator.java
@@ -1,9 +1,11 @@
-package digit.service;
+package digit.service.validator;
 
 import com.jayway.jsonpath.JsonPath;
 import digit.config.Configuration;
 import digit.repository.PlanConfigurationRepository;
 import digit.repository.PlanRepository;
+import digit.service.PlanEmployeeService;
+import digit.service.enrichment.PlanEnricher;
 import digit.util.BoundaryUtil;
 import digit.util.CampaignUtil;
 import digit.util.CommonUtil;