You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2026/03/28 02:17:54 UTC
(airavata) branch master updated: refactor: Phase 3 — execution module, Testcontainers, Java 25 deps

This is an automated email from the ASF dual-hosted git repository.

yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a022a5523 refactor: Phase 3 — execution module, Testcontainers, Java 25 deps
3a022a5523 is described below

commit 3a022a552397f3f92f89f80f9397b47e34708a9a
Author: Yasith Jayawardana <ya...@gatech.edu>
AuthorDate: Fri Mar 27 21:17:49 2026 -0500

    refactor: Phase 3 — execution module, Testcontainers, Java 25 deps
    
    Reorganizes remaining classes into execution module, replaces Derby with Testcontainers MariaDB, fixes all tests (301 pass, 0 fail), updates deps for Java 25.
---
 airavata-api/pom.xml                               |   45 +-
 .../airavata/common/config/ServerSettings.java     |    4 +-
 .../org/apache/airavata/common/db/DerbyUtil.java   |  112 --
 .../common/server/KeyStorePasswordCallback.java    |   38 +-
 .../airavata/common/server/MonitoringServer.java   |    1 -
 .../airavata/common/server/ServiceRegistry.java    |    1 -
 .../common/util/AiravataClientFactory.java         |    2 +-
 .../repository/AppCatAbstractRepository.java       |    4 +-
 .../ApplicationDeploymentRepository.java           |   12 +-
 .../repository/ApplicationInputRepository.java     |    2 +-
 .../repository/ApplicationInterfaceRepository.java |   16 +-
 .../repository/ApplicationModuleRepository.java    |    2 +-
 .../repository/ApplicationOutputRepository.java    |    2 +-
 .../repository/BatchQueuePolicyRepository.java     |    2 +-
 .../compute/repository/BatchQueueRepository.java   |    2 +-
 .../ComputeResourcePolicyRepository.java           |    2 +-
 .../repository/ComputeResourcePrefRepository.java  |    2 +-
 .../repository/ComputeResourceRepository.java      |   30 +-
 .../repository/GatewayGroupsRepository.java        |    2 +-
 .../repository/GroupResourceProfileRepository.java |   16 +-
 .../repository/GrpComputePrefRepository.java       |    8 +-
 .../repository/GwyResourceProfileRepository.java   |   12 +-
 .../JobSubmissionInterfaceRepository.java          |    4 +-
 .../compute/repository/ParserInputRepository.java  |    4 +-
 .../compute/repository/ParserOutputRepository.java |    4 +-
 .../compute/repository/ParserRepository.java       |   10 +-
 .../repository/ParsingTemplateRepository.java      |    6 +-
 .../repository/ResourceJobManagerRepository.java   |    6 +-
 .../UserComputeResourcePreferenceRepository.java   |    2 +-
 .../repository/UserResourceProfileRepository.java  |   16 +-
 .../compute/service/ApplicationCatalogService.java |   12 +-
 .../service/GatewayResourceProfileService.java     |    6 +-
 .../service/GroupResourceProfileService.java       |   12 +-
 .../airavata/compute/service/ParserService.java    |    6 +-
 .../airavata/compute/service/ResourceService.java  |   11 +-
 .../service/UserResourceProfileService.java        |    6 +-
 .../task/AiravataCustomCommandOutputParser.java    |    1 -
 .../compute/task/CloudJobManagerConfiguration.java |    4 -
 .../compute/task/DefaultJobSubmissionTask.java     |   12 +-
 .../compute/task/ForkJobConfiguration.java         |    3 -
 .../compute/task/ForkJobSubmissionTask.java        |   10 +-
 .../airavata/compute/task/ForkOutputParser.java    |    1 -
 .../airavata/compute/task/GroovyMapBuilder.java    |    4 +-
 .../compute/task/HTCondorJobConfiguration.java     |    3 -
 .../compute/task/HTCondorOutputParser.java         |    2 -
 .../apache/airavata/compute/task/JobFactory.java   |    4 +-
 .../airavata/compute/task/JobSubmissionTask.java   |   12 +-
 .../airavata/compute/task/LSFJobConfiguration.java |    3 -
 .../airavata/compute/task/LSFOutputParser.java     |    1 -
 .../compute/task/LocalJobSubmissionTask.java       |    7 +-
 .../airavata/compute/task/PBSJobConfiguration.java |    3 -
 .../airavata/compute/task/PBSOutputParser.java     |    2 -
 .../compute/task/SlurmJobConfiguration.java        |    3 -
 .../airavata/compute/task/SlurmOutputParser.java   |    2 -
 .../airavata/compute/task/UGEJobConfiguration.java |    3 -
 .../airavata/compute/task/UGEOutputParser.java     |    1 -
 .../compute/task/aws/AWSCompletingTask.java        |    9 +-
 .../compute/task/aws/AWSJobSubmissionTask.java     |   16 +-
 .../compute/task/aws/AWSProcessContextManager.java |    2 +-
 .../airavata/compute/task/aws/AWSTaskUtil.java     |    3 +-
 .../compute/task/aws/CreateEC2InstanceTask.java    |    9 +-
 .../airavata/compute/task/aws/NoOperationTask.java |    8 +-
 .../apache/airavata/compute/util/AgentUtils.java   |    6 +-
 .../airavata/compute/util/PoolingSSHJClient.java   |    4 -
 .../airavata/compute/util/SSHJAgentAdaptor.java    |    7 +-
 .../airavata/compute/util/SshAdaptorParams.java    |    1 -
 .../airavata/compute/util/SshAgentAdaptor.java     |    3 +-
 .../airavata/compute/util/StandardOutReader.java   |    1 -
 .../handler/CredentialStoreServerHandler.java      |   69 +-
 .../credential/model/CertificateAuditInfo.java     |    2 -
 .../credential/model/CertificateCredential.java    |    2 -
 .../credential/model/PasswordCredential.java       |    2 -
 .../airavata/credential/model/SSHCredential.java   |    1 -
 .../repository/CertificateCredentialWriter.java    |    6 +-
 .../repository/CredentialReaderFactory.java        |    3 +-
 .../repository/CredentialReaderImpl.java           |    8 +-
 .../credential/repository/SSHCredentialWriter.java |    4 +-
 .../credential/repository/db/CredentialsDAO.java   |    2 +-
 .../repository/util/CredentialStoreJDBCConfig.java |    4 +-
 .../credential/service/CredentialService.java      |   10 +-
 .../credential/service/SSHAccountService.java      |    6 +-
 .../service/provisioning/SSHAccountManager.java    |    6 +-
 .../airavata/credential/task/EnvSetupTask.java     |   10 +-
 .../airavata/credential/util/TestSSLClient.java    |    2 +-
 .../apache/airavata/credential/util/Utility.java   |    4 +-
 .../util/notifier/CredentialStoreNotifier.java     |   38 +-
 .../util/notifier/NotifierBootstrap.java           |   12 +-
 .../util/notifier/impl/EmailNotifier.java          |    2 +-
 .../handler/RegistryServerHandler.java             |   18 +-
 .../handler}/RegistryServiceDBEventHandler.java    |    6 +-
 .../RegistryServiceDBEventMessagingFactory.java    |    6 +-
 .../ComputationalResourceSchedulingEntity.java     |    2 +-
 .../model}/ComputationalResourceSchedulingPK.java  |    2 +-
 .../model}/ExperimentEntity.java                   |    2 +-
 .../model}/ExperimentErrorEntity.java              |    2 +-
 .../model}/ExperimentErrorPK.java                  |    2 +-
 .../model}/ExperimentInputEntity.java              |    2 +-
 .../model}/ExperimentInputPK.java                  |    2 +-
 .../model}/ExperimentOutputEntity.java             |    2 +-
 .../model}/ExperimentOutputPK.java                 |    2 +-
 .../model}/ExperimentStatusEntity.java             |    2 +-
 .../model}/ExperimentStatusPK.java                 |    2 +-
 .../model}/ExperimentSummaryEntity.java            |    2 +-
 .../model}/GatewayEntity.java                      |    2 +-
 .../model}/GatewayUsageReportingCommandEntity.java |    2 +-
 .../model}/GatewayUsageReportingPK.java            |    2 +-
 .../model}/GatewayWorkerEntity.java                |    2 +-
 .../model}/GatewayWorkerPK.java                    |    2 +-
 .../expcatalog => execution/model}/JobEntity.java  |    2 +-
 .../expcatalog => execution/model}/JobPK.java      |    2 +-
 .../model}/JobStatusEntity.java                    |    2 +-
 .../model}/JobStatusPK.java                        |    2 +-
 .../model}/NotificationEntity.java                 |    2 +-
 .../model}/ProcessEntity.java                      |    2 +-
 .../model}/ProcessErrorEntity.java                 |    2 +-
 .../model}/ProcessErrorPK.java                     |    2 +-
 .../model}/ProcessInputEntity.java                 |    2 +-
 .../model}/ProcessInputPK.java                     |    2 +-
 .../model}/ProcessOutputEntity.java                |    2 +-
 .../model}/ProcessOutputPK.java                    |    2 +-
 .../model}/ProcessResourceScheduleEntity.java      |    2 +-
 .../model}/ProcessStatusEntity.java                |    2 +-
 .../model}/ProcessStatusPK.java                    |    2 +-
 .../model}/ProcessWorkflowEntity.java              |    2 +-
 .../model}/ProcessWorkflowPK.java                  |    2 +-
 .../model}/ProjectEntity.java                      |    2 +-
 .../model}/ProjectUserEntity.java                  |    2 +-
 .../model}/ProjectUserPK.java                      |    2 +-
 .../model}/QueueStatusEntity.java                  |    2 +-
 .../model}/QueueStatusPK.java                      |    2 +-
 .../expcatalog => execution/model}/TaskEntity.java |    2 +-
 .../model}/TaskErrorEntity.java                    |    2 +-
 .../model}/TaskErrorPK.java                        |    2 +-
 .../model}/TaskStatusEntity.java                   |    2 +-
 .../model}/TaskStatusPK.java                       |    2 +-
 .../model}/UserConfigurationDataEntity.java        |    2 +-
 .../expcatalog => execution/model}/UserEntity.java |    2 +-
 .../expcatalog => execution/model}/UserPK.java     |    2 +-
 .../model/workflow}/AiravataWorkflowEntity.java    |    2 +-
 .../workflow}/AiravataWorkflowErrorEntity.java     |    2 +-
 .../model/workflow}/AiravataWorkflowErrorPK.java   |    2 +-
 .../workflow}/AiravataWorkflowStatusEntity.java    |    2 +-
 .../model/workflow}/AiravataWorkflowStatusPK.java  |    2 +-
 .../model/workflow}/ApplicationErrorEntity.java    |    2 +-
 .../model/workflow}/ApplicationErrorPK.java        |    2 +-
 .../model/workflow}/ApplicationStatusEntity.java   |    2 +-
 .../model/workflow}/ApplicationStatusPK.java       |    2 +-
 .../model/workflow}/ComponentStatusEntity.java     |    2 +-
 .../model/workflow}/EdgeEntity.java                |    2 +-
 .../model/workflow}/EdgePK.java                    |    2 +-
 .../model/workflow}/HandlerErrorEntity.java        |    2 +-
 .../model/workflow}/HandlerErrorPK.java            |    2 +-
 .../model/workflow}/HandlerInputEntity.java        |    2 +-
 .../model/workflow}/HandlerInputPK.java            |    2 +-
 .../model/workflow}/HandlerOutputEntity.java       |    2 +-
 .../model/workflow}/HandlerOutputPK.java           |    2 +-
 .../model/workflow}/HandlerStatusEntity.java       |    2 +-
 .../model/workflow}/HandlerStatusPK.java           |    2 +-
 .../model/workflow}/NodeEntity.java                |    2 +-
 .../model/workflow}/NodePK.java                    |    2 +-
 .../model/workflow}/PortEntity.java                |    2 +-
 .../model/workflow}/PortPK.java                    |    2 +-
 .../model/workflow}/WorkflowApplicationEntity.java |    2 +-
 .../model/workflow}/WorkflowApplicationPK.java     |    2 +-
 .../model/workflow}/WorkflowConnectionEntity.java  |    2 +-
 .../model/workflow}/WorkflowConnectionPK.java      |    2 +-
 .../model/workflow}/WorkflowDataBlockEntity.java   |    2 +-
 .../model/workflow}/WorkflowEntity.java            |    2 +-
 .../model/workflow}/WorkflowHandlerEntity.java     |    2 +-
 .../model/workflow}/WorkflowHandlerPK.java         |    2 +-
 .../model/workflow}/WorkflowInputEntity.java       |    2 +-
 .../model/workflow}/WorkflowInputPK.java           |    2 +-
 .../model/workflow}/WorkflowOutputEntity.java      |    2 +-
 .../model/workflow}/WorkflowOutputPK.java          |    2 +-
 .../model/workflow}/WorkflowStatusEntity.java      |    2 +-
 .../model/workflow}/WorkflowStatusPK.java          |    2 +-
 .../{ => execution}/monitor/AbstractMonitor.java   |    2 +-
 .../monitor}/AiravataCustomMailParser.java         |    3 +-
 .../monitor}/ClusterStatusMonitorJob.java          |    4 +-
 .../monitor}/ClusterStatusMonitorJobScheduler.java |    4 +-
 .../ComputationalResourceMonitoringService.java    |    6 +-
 .../monitor}/ComputeResourceMonitor.java           |    4 +-
 .../utils => execution/monitor}/Constants.java     |    2 +-
 .../monitor}/EmailBasedMonitor.java                |   12 +-
 .../parser => execution/monitor}/EmailParser.java  |    3 +-
 .../monitor}/HTCondorEmailParser.java              |    3 +-
 .../{ => execution}/monitor/JobStateValidator.java |    2 +-
 .../{ => execution}/monitor/JobStatusResult.java   |    2 +-
 .../monitor}/JobStatusResultDeserializer.java      |    3 +-
 .../monitor}/JobStatusResultSerializer.java        |    3 +-
 .../monitor}/LSFEmailParser.java                   |    3 +-
 .../monitor}/MessageProducer.java                  |    5 +-
 .../monitor/MonitoringException.java               |    2 +-
 .../job => execution/monitor}/MonitoringJob.java   |   11 +-
 .../output => execution/monitor}/OutputParser.java |    2 +-
 .../monitor}/OutputParserImpl.java                 |    3 +-
 .../monitor}/PBSEmailParser.java                   |    3 +-
 .../monitor}/RealtimeJobStatusParser.java          |    3 +-
 .../monitor}/RealtimeMonitor.java                  |    9 +-
 .../monitor}/ResourceConfig.java                   |    2 +-
 .../monitor}/SLURMEmailParser.java                 |    3 +-
 .../monitor}/UGEEmailParser.java                   |    3 +-
 .../orchestrator}/AWSTaskFactory.java              |    2 +-
 .../orchestrator}/AbstractOrchestrator.java        |    9 +-
 .../orchestrator}/AbstractTask.java                |   10 +-
 .../orchestrator}/AdaptorSupport.java              |    4 +-
 .../orchestrator}/AdaptorSupportImpl.java          |    7 +-
 .../orchestrator}/AgentStore.java                  |    4 +-
 .../orchestrator}/AiravataTask.java                |   12 +-
 .../orchestrator}/BatchQueueValidator.java         |    7 +-
 .../util => execution/orchestrator}/Constants.java |    2 +-
 .../orchestrator}/DefaultHostScheduler.java        |    2 +-
 .../orchestrator}/ExperimentStatusValidator.java   |    3 +-
 .../orchestrator}/GFACPassiveJobSubmitter.java     |    8 +-
 .../orchestrator}/GlobalParticipant.java           |   22 +-
 .../GroupResourceProfileValidator.java             |    7 +-
 .../orchestrator}/HelixController.java             |    4 +-
 .../orchestrator}/HelixParticipant.java            |    7 +-
 .../orchestrator}/HelixTaskFactory.java            |    2 +-
 .../orchestrator}/HostScheduler.java               |    2 +-
 .../orchestrator}/JobMetadataValidator.java        |    2 +-
 .../orchestrator}/JobSubmitter.java                |    5 +-
 .../orchestrator}/MonitoringUtil.java              |    2 +-
 .../orchestrator}/Orchestrator.java                |    3 +-
 .../orchestrator}/OrchestratorClientFactory.java   |    2 +-
 .../orchestrator}/OrchestratorClientSample.java    |    4 +-
 .../orchestrator}/OrchestratorConfiguration.java   |    2 +-
 .../orchestrator}/OrchestratorConstants.java       |    2 +-
 .../orchestrator}/OrchestratorContext.java         |    3 +-
 .../orchestrator}/OrchestratorException.java       |    2 +-
 .../OrchestratorServerThreadPoolExecutor.java      |    4 +-
 .../orchestrator/OrchestratorServerUtils.java}     |    8 +-
 .../orchestrator}/OrchestratorUtils.java           |   10 +-
 .../core => execution/orchestrator}/OutPort.java   |    2 +-
 .../orchestrator}/ParserWorkflowManager.java       |   24 +-
 .../orchestrator}/PostWorkflowManager.java         |   20 +-
 .../orchestrator}/PreWorkflowManager.java          |   21 +-
 .../orchestrator}/PropertyResolver.java            |    2 +-
 .../orchestrator}/QueueOperator.java               |    6 +-
 .../orchestrator}/SimpleOrchestratorImpl.java      |   14 +-
 .../orchestrator}/SlurmTaskFactory.java            |   10 +-
 .../orchestrator}/TaskContext.java                 |    6 +-
 .../orchestrator}/TaskDef.java                     |    2 +-
 .../orchestrator}/TaskFactory.java                 |    2 +-
 .../api => execution/orchestrator}/TaskHelper.java |    4 +-
 .../orchestrator}/TaskHelperImpl.java              |    5 +-
 .../orchestrator}/TaskOnFailException.java         |    2 +-
 .../orchestrator}/TaskOutPort.java                 |    2 +-
 .../orchestrator}/TaskParam.java                   |    2 +-
 .../orchestrator}/TaskParamType.java               |    2 +-
 .../util => execution/orchestrator}/TaskUtil.java  |    7 +-
 .../orchestrator}/WorkflowCleanupAgent.java        |    4 +-
 .../orchestrator}/WorkflowManager.java             |    5 +-
 .../orchestrator}/WorkflowOperator.java            |    8 +-
 .../repository}/ExpCatAbstractRepository.java      |    6 +-
 .../repository}/ExperimentErrorRepository.java     |   12 +-
 .../repository}/ExperimentInputRepository.java     |   10 +-
 .../repository}/ExperimentOutputRepository.java    |   10 +-
 .../repository}/ExperimentRepository.java          |   16 +-
 .../repository}/ExperimentStatusRepository.java    |   12 +-
 .../repository}/ExperimentSummaryRepository.java   |   12 +-
 .../repository}/GatewayRepository.java             |   14 +-
 .../GatewayUsageReportingCommandRepository.java    |   10 +-
 .../repository}/JobRepository.java                 |   16 +-
 .../repository}/JobStatusRepository.java           |   16 +-
 .../repository}/NotificationRepository.java        |   12 +-
 .../repository}/ProcessErrorRepository.java        |   12 +-
 .../repository}/ProcessInputRepository.java        |   10 +-
 .../repository}/ProcessOutputRepository.java       |   10 +-
 .../repository}/ProcessRepository.java             |   14 +-
 .../repository}/ProcessStatusRepository.java       |   16 +-
 .../repository}/ProcessWorkflowRepository.java     |   10 +-
 .../repository}/ProjectRepository.java             |   16 +-
 .../repository}/QueueStatusRepository.java         |   12 +-
 .../repository}/TaskErrorRepository.java           |   12 +-
 .../repository}/TaskRepository.java                |   14 +-
 .../repository}/TaskStatusRepository.java          |   12 +-
 .../repository}/UserRepository.java                |   12 +-
 .../repository}/WorkflowCatAbstractRepository.java |    6 +-
 .../repository}/WorkflowRepository.java            |   10 +-
 .../scheduler/AnalyzerConstants.java}              |    4 +-
 .../scheduler}/ComputeResourceSelectionPolicy.java |    2 +-
 .../ComputeResourceSelectionPolicyImpl.java        |    4 +-
 .../scheduler}/DataAnalyzer.java                   |    2 +-
 .../scheduler}/DataAnalyzerImpl.java               |    4 +-
 .../scheduler}/DataInterpreterService.java         |   14 +-
 .../DefaultComputeResourceSelectionPolicy.java     |    2 +-
 .../scheduler}/ExponentialBackOffReScheduler.java  |    7 +-
 .../scheduler}/MultipleComputeResourcePolicy.java  |    2 +-
 .../scheduler}/ProcessReschedulingService.java     |   13 +-
 .../scheduler}/ProcessScanner.java                 |    2 +-
 .../scheduler}/ProcessScannerImpl.java             |    5 +-
 .../scheduler}/ProcessScheduler.java               |    2 +-
 .../scheduler}/ProcessSchedulerImpl.java           |    5 +-
 .../scheduler}/ReScheduler.java                    |    2 +-
 .../scheduler/SchedulerConstants.java}             |    4 +-
 .../core/utils => execution/scheduler}/Utils.java  |    4 +-
 .../service}/ExperimentService.java                |   16 +-
 .../service}/GatewayService.java                   |   10 +-
 .../service}/NotificationService.java              |    6 +-
 .../service}/ProjectService.java                   |   12 +-
 .../service}/RequestContext.java                   |    2 +-
 .../service}/ServiceAuthorizationException.java    |    2 +-
 .../service}/ServiceException.java                 |    2 +-
 .../service}/ServiceNotFoundException.java         |    2 +-
 .../task}/CancelCompletingTask.java                |   10 +-
 .../task}/CompletingTask.java                      |   10 +-
 .../task}/DataParsingTask.java                     |   28 +-
 .../task}/JobVerificationTask.java                 |   14 +-
 .../task/mock => execution/task}/MockTask.java     |    8 +-
 .../task}/ParsingTaskInput.java                    |    2 +-
 .../task}/ParsingTaskInputs.java                   |    4 +-
 .../task}/ParsingTaskOutput.java                   |    2 +-
 .../task}/ParsingTaskOutputs.java                  |    4 +-
 .../task}/ParsingTriggeringTask.java               |   13 +-
 .../task}/ProcessCompletionMessage.java            |    2 +-
 .../ProcessCompletionMessageDeserializer.java      |    3 +-
 .../task}/ProcessCompletionMessageSerializer.java  |    3 +-
 .../task}/RemoteJobCancellationTask.java           |   14 +-
 .../task}/WorkflowCancellationTask.java            |   10 +-
 .../util}/AbstractRepository.java                  |    5 +-
 .../utils => execution/util}/AiravataJobState.java |    2 +-
 .../util}/AppCatalogDBInitConfig.java              |    6 +-
 .../util}/AppCatalogJDBCConfig.java                |    6 +-
 .../util}/AppCatalogJPAUtils.java                  |   19 +-
 .../utils => execution/util}/AppCatalogUtils.java  |    2 +-
 .../core/utils => execution/util}/Committer.java   |    2 +-
 .../util}/CsvStringConverter.java                  |    2 +-
 .../util}/CustomBeanFactory.java                   |    6 +-
 .../core/utils => execution/util}/DBConstants.java |    2 +-
 .../{model => execution}/util/ExecutionType.java   |    2 +-
 .../util}/ExpCatalogDBInitConfig.java              |    8 +-
 .../util}/ExpCatalogJDBCConfig.java                |    6 +-
 .../util}/ExpCatalogJPAUtils.java                  |   19 +-
 .../utils => execution/util}/ExpCatalogUtils.java  |    2 +-
 .../util/ExperimentModelUtil.java                  |    2 +-
 .../util}/ObjectMapperSingleton.java               |    2 +-
 .../util/ProjectModelUtil.java                     |    2 +-
 .../utils => execution/util}/QueryConstants.java   |    8 +-
 .../util/RegistryConstants.java}                   |    4 +-
 .../core => execution/util}/RegistryException.java |    2 +-
 .../util}/RegistryServiceClientFactory.java        |    2 +-
 .../util}/RepCatalogJPAUtils.java                  |   19 +-
 .../util}/ReplicaCatalogDBInitConfig.java          |    2 +-
 .../util}/ReplicaCatalogJDBCConfig.java            |    6 +-
 .../util}/StorageDateConverter.java                |    2 +-
 .../util}/WorkflowCatalogDBInitConfig.java         |    2 +-
 .../util}/WorkflowCatalogJDBCConfig.java           |    6 +-
 .../util}/WorkflowCatalogJPAUtils.java             |   19 +-
 .../util}/WorkflowCatalogUtils.java                |    2 +-
 .../util}/WorkflowContext.java                     |    2 +-
 .../util}/cpi/AppCatalog.java                      |    2 +-
 .../util}/cpi/AppCatalogException.java             |    2 +-
 .../util}/cpi/ApplicationDeployment.java           |    2 +-
 .../util}/cpi/ApplicationInterface.java            |    2 +-
 .../util}/cpi/CompositeIdentifier.java             |    2 +-
 .../util}/cpi/ComputeResource.java                 |    2 +-
 .../utils => execution/util/cpi}/Constants.java    |    2 +-
 .../util}/cpi/DataProductInterface.java            |    2 +-
 .../util}/cpi/DataReplicaLocationInterface.java    |    2 +-
 .../util}/cpi/ExpCatChildDataType.java             |    2 +-
 .../util}/cpi/ExpCatParentDataType.java            |    2 +-
 .../util}/cpi/ExperimentCatalog.java               |    6 +-
 .../util}/cpi/ExperimentCatalogException.java      |    2 +-
 .../util}/cpi/ExperimentCatalogModelType.java      |    2 +-
 .../util}/cpi/GwyClientCredential.java             |    2 +-
 .../util}/cpi/GwyResourceProfile.java              |    2 +-
 .../{registry => execution/util}/cpi/Registry.java |    2 +-
 .../util}/cpi/RegistryException.java               |    2 +-
 .../util}/cpi/ReplicaCatalog.java                  |    2 +-
 .../util}/cpi/ReplicaCatalogException.java         |    2 +-
 .../execution/util/cpi/ResultOrderType.java        |   48 +
 .../utils => execution/util/cpi}/StatusType.java   |    2 +-
 .../util}/cpi/StorageResource.java                 |    2 +-
 .../util}/cpi/UsrResourceProfile.java              |    2 +-
 .../util}/cpi/WorkflowCatalog.java                 |    2 +-
 .../util}/cpi/WorkflowCatalogException.java        |    2 +-
 .../handler/DBEventManagerMessagingFactory.java    |    3 +-
 .../messaging/handler/DBEventManagerRunner.java    |    1 -
 .../messaging/handler/DBEventMessageHandler.java   |    7 +-
 .../messaging/handler/ExperimentConsumer.java      |    2 +-
 .../messaging/handler/ProcessConsumer.java         |    2 +-
 .../messaging/handler/RabbitMQListener.java        |    2 +-
 .../airavata/messaging/service/EventPublisher.java |    2 -
 .../messaging/service/MessagingFactory.java        |    6 +-
 .../messaging/service/RabbitMQPublisher.java       |    2 -
 .../messaging/service/RabbitMQSubscriber.java      |    1 -
 .../messaging/util/DBEventPublisherUtils.java      |    2 -
 .../messaging/util/DbEventManagerZkUtils.java      |    2 +-
 .../airavata/registry/cpi/ResultOrderType.java     |   48 -
 .../security/profile/commons/utils/JPAUtils.java   |   17 +-
 .../security/profile/commons/utils/Utils.java      |    2 +-
 .../core/impl/TenantManagementKeycloakImpl.java    |    4 +-
 .../security/repository/AbstractJDBCUserStore.java |    2 +-
 .../security/repository/JDBCUserStore.java         |    2 +-
 .../security/repository/LDAPUserStore.java         |    2 +-
 .../security/service/GatewayGroupsInitializer.java |    8 +-
 .../security/service/KeyCloakSecurityManager.java  |   10 +-
 .../security/service/SecurityManagerFactory.java   |    2 +-
 .../security/service/authzcache/AuthzCache.java    |    2 +-
 .../authzcache/AuthzCacheManagerFactory.java       |    2 +-
 .../service/interceptor/SecurityInterceptor.java   |    6 +-
 .../util/AuthenticatorConfigurationReader.java     |    3 -
 .../airavata/security/util/PasswordDigester.java   |    2 -
 .../handler/SharingRegistryServerHandler.java      |    8 +-
 .../handler/SharingServiceDBEventHandler.java      |    4 +-
 .../SharingServiceDBEventMessagingFactory.java     |    4 +-
 .../sharing/repository/AbstractRepository.java     |    2 +-
 .../sharing/repository/EntityRepository.java       |    2 +-
 .../repository/GroupMembershipRepository.java      |    2 +-
 .../repository/PermissionTypeRepository.java       |    4 +-
 .../sharing/repository/SharingRepository.java      |    2 +-
 .../sharing/repository/UserGroupRepository.java    |    2 +-
 .../sharing/repository/UserRepository.java         |    2 +-
 .../sharing/service/ResourceSharingService.java    |   10 +-
 .../airavata/sharing/service/SharingHelper.java    |    4 +-
 .../sharing/util/AiravataDataMigrator.java         |   15 +-
 .../airavata/sharing/util/ConnectionFactory.java   |    2 +-
 .../org/apache/airavata/sharing/util/JPAUtils.java |   17 +-
 .../sharing/util/SharingRegistryJDBCConfig.java    |    4 +-
 .../storage/model/DataMovementInterfaceEntity.java |    2 +-
 .../storage/repository/DataMovementRepository.java |    4 +-
 .../storage/repository/DataProductRepository.java  |   10 +-
 .../repository/DataReplicaLocationRepository.java  |    6 +-
 .../repository/RepCatAbstractRepository.java       |    4 +-
 .../storage/repository/StoragePrefRepository.java  |    2 +-
 .../repository/StorageResourceRepository.java      |   14 +-
 .../UserStoragePreferenceRepository.java           |    2 +-
 .../storage/service/DataProductService.java        |    6 +-
 .../apache/airavata/storage/task/ArchiveTask.java  |   16 +-
 .../airavata/storage/task/DataStagingTask.java     |   16 +-
 .../storage/task/InputDataStagingTask.java         |   12 +-
 .../storage/task/OutputDataStagingTask.java        |   12 +-
 .../storage/util/StorageResourceAdaptorImpl.java   |    1 -
 .../src/main/resources/META-INF/persistence.xml    |   82 +-
 .../src/main/resources/airavata-server.properties  |    4 +-
 airavata-api/src/main/resources/dozer_mapping.xml  |   16 +-
 .../{utils => util}/ThriftClientPoolTest.java      |    7 +-
 .../airavata/common/utils/DatabaseTestCases.java   |   19 +-
 .../airavata/common/utils/DerbyTestUtil.java       |  455 -----
 .../ApplicationDeploymentRepositoryTest.java       |   12 +-
 .../ApplicationInterfaceRepositoryTest.java        |    6 +-
 .../repository}/ComputeResourceRepositoryTest.java |   12 +-
 .../repository}/GatewayGroupsRepositoryTest.java   |    2 +-
 .../repository}/GatewayProfileRepositoryTest.java  |    8 +-
 .../GroupResourceProfileRepositoryTest.java        |   10 +-
 .../JobSubmissionInterfaceRepositoryTest.java      |    6 +-
 .../repository}/StorageResourceRepositoryTest.java |    4 +-
 .../UserResourceProfileRepositoryTest.java         |    6 +-
 .../service}/ApplicationCatalogServiceTest.java    |    6 +-
 .../GatewayResourceProfileServiceTest.java         |    6 +-
 .../service}/GroupResourceProfileServiceTest.java  |    4 +-
 .../service}/ParserServiceTest.java                |    6 +-
 .../service}/ResourceServiceTest.java              |    5 +-
 .../service}/UserResourceProfileServiceTest.java   |    6 +-
 .../GroupComputeResourcePreferenceUtilTest.java    |    8 +-
 .../{helix => compute/util}/SFTPDeleteDirTest.java |    3 +-
 .../repository/db/CommunityUserDAOTest.java        |   24 +-
 .../repository/db/CredentialsDAOTest.java          |   56 +-
 .../repository/db/SSHCredentialTest.java           |    2 +-
 .../credential/service/CredentialServiceTest.java  |    6 +-
 .../credential/service/SSHAccountServiceTest.java  |    6 +-
 .../store/cpi/SSHSummaryTest/SSHSummaryTest.java   |   33 +-
 .../util/notifier/impl/EmailNotifierTest.java      |    2 +-
 .../orchestrator}/BaseOrchestratorTest.java        |    2 +-
 .../orchestrator}/NewOrchestratorTest.java         |    2 +-
 .../OrchestratorClientFactoryTest.java             |    2 +-
 .../orchestrator}/OrchestratorTestWithGRAM.java    |    2 +-
 .../OrchestratorTestWithMyProxyAuth.java           |    2 +-
 .../repository}/ExperimentErrorRepositoryTest.java |    8 +-
 .../repository}/ExperimentInputRepositoryTest.java |    8 +-
 .../ExperimentOutputRepositoryTest.java            |    8 +-
 .../repository}/ExperimentRepositoryTest.java      |   10 +-
 .../ExperimentStatusRepositoryTest.java            |   10 +-
 .../ExperimentSummaryRepositoryTest.java           |   16 +-
 .../repository}/GatewayRepositoryTest.java         |   19 +-
 .../repository}/JobRepositoryTest.java             |   14 +-
 .../repository}/JobStatusRepositoryTest.java       |   12 +-
 .../repository}/NotificationRepositoryTest.java    |    6 +-
 .../repository}/ProcessErrorRepositoryTest.java    |    8 +-
 .../repository}/ProcessInputRepositoryTest.java    |    8 +-
 .../repository}/ProcessOutputRepositoryTest.java   |    8 +-
 .../repository}/ProcessRepositoryTest.java         |   12 +-
 .../repository}/ProcessStatusRepositoryTest.java   |    8 +-
 .../repository}/ProjectRepositoryTest.java         |    8 +-
 .../repository}/QueueStatusRepositoryTest.java     |    6 +-
 .../repository}/TaskErrorRepositoryTest.java       |    9 +-
 .../repository}/TaskRepositoryTest.java            |   12 +-
 .../repository}/TaskStatusRepositoryTest.java      |    9 +-
 .../repository}/UserRepositoryTest.java            |    8 +-
 .../repository}/WorkflowRepositoryTest.java        |    6 +-
 .../service}/ExperimentServiceTest.java            |    9 +-
 .../service}/GatewayServiceTest.java               |    5 +-
 .../service}/NotificationServiceTest.java          |    5 +-
 .../service}/ProjectServiceTest.java               |    7 +-
 .../service}/RequestContextTest.java               |    2 +-
 .../util}/CustomBeanFactoryTest.java               |   15 +-
 .../util}/ObjectMapperSingletonTest.java           |    2 +-
 .../util}/WorkspaceRepositoryTest.java             |    2 +-
 .../execution/util/common/SharedMariaDB.java       |   52 +
 .../SharedMariaDBLauncherSessionListener.java}     |   27 +-
 .../airavata/execution/util/common/TestBase.java   |   96 ++
 .../replicacatalog/DataProductRepositoryTest.java  |   14 +-
 .../DataReplicaLocationRepositoryTest.java         |    6 +-
 .../integration/AbstractIntegrationTest.java       |   12 +-
 .../ExperimentRepositoryIntegrationTest.java       |   27 +-
 .../integration/SharingServiceIntegrationTest.java |   24 +-
 .../core/repositories/common/DerbyTestUtil.java    |  454 -----
 .../core/repositories/common/TestBase.java         |   98 --
 .../admin/services/core/tests/SetupNewGateway.java |    2 +-
 .../security/repository/JDBCUserStoreTest.java     |   46 +-
 .../repository/SessionDBUserStoreTest.java         |   35 +-
 .../service/GatewayGroupsInitializerTest.java      |    1 +
 .../service/KeyCloakSecurityManagerTest.java       |    9 +-
 .../util/AuthenticatorConfigurationReaderTest.java |    9 +-
 .../airavata/security/util/SecurityUtilTest.java   |    9 +-
 .../security/util/TestDBAuthenticator1.java        |    3 -
 .../security/util/TestDBAuthenticator2.java        |    2 -
 .../security/util/TestDBAuthenticator3.java        |    3 -
 .../airavata/security/util/TestUserStore.java      |    1 -
 .../sharing/{registry => handler}/CipresTest.java  |    4 +-
 .../SharingRegistryServerHandlerTest.java          |   15 +-
 .../service/ResourceSharingServiceTest.java        |    6 +-
 .../service}/DataProductServiceTest.java           |    9 +-
 ...vice.provisioning.SSHAccountProvisionerProvider |    1 +
 ...junit.platform.launcher.LauncherSessionListener |    1 +
 airavata-api/src/test/resources/airavata.p12       |  Bin 0 -> 3047 bytes
 airavata-api/src/test/resources/authenticators.xml |    6 +-
 .../db/migration/airavata/V1__Baseline_schema.sql  | 1747 ++++++++++++++++++++
 .../src/test/resources/credential-store/client.xml |    6 +
 .../src/test/resources/disabled-authenticator.xml  |    8 +-
 .../src/test/resources/jdbc-authenticator.xml      |    2 +-
 .../src/test/resources/orchestrator.properties     |    2 +-
 .../src/test/resources/session-authenticator.xml   |    2 +-
 .../src/test/resources/testcontainers.properties   |    1 +
 .../apache/airavata/api/server/AiravataServer.java |   46 +-
 .../api/server/handler/AiravataServerHandler.java  |   34 +-
 .../airavata/api/server/handler/ThriftAdapter.java |    8 +-
 .../server/OrchestratorServerHandler.java          |   52 +-
 .../handlers/GroupManagerServiceHandler.java       |    8 +-
 .../profile/handlers/IamAdminServicesHandler.java  |   14 +-
 .../handlers/TenantProfileServiceHandler.java      |    8 +-
 .../handlers/UserProfileServiceHandler.java        |   18 +-
 .../airavata/client/samples/CreateLaunchBES.java   |    2 +-
 .../client/samples/CreateLaunchExperiment.java     |    4 +-
 .../client/samples/CreateLaunchExperimentUS3.java  |    4 +-
 .../file/server/FileServerConfiguration.java       |    4 +-
 .../file/server/service/AirvataFileService.java    |    6 +-
 .../file/server/service/ProcessDataManager.java    |    8 +-
 pom.xml                                            |   66 +-
 550 files changed, 3625 insertions(+), 3046 deletions(-)

diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index 363c46a43a..402d15879e 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -90,22 +90,6 @@ under the License.
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbyclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbynet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbytools</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
@@ -180,25 +164,33 @@ under the License.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.11.0</version>
+      <version>5.23.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>5.11.0</version>
+      <version>5.23.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mariadb</artifactId>
-      <version>1.20.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.20.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -500,8 +492,8 @@ under the License.
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
         <configuration>
-          <includes>**/entities/**/*.class</includes>
-          <excludes>**/entities/**/XML*.class,**/model/**/*.class,**/entities/**/*PK.class</excludes>
+          <includes>**/entities/**/*.class,**/compute/model/*.class,**/storage/model/*.class,**/execution/model/*.class,**/execution/model/workflow/*.class,**/sharing/model/*.class,**/credential/model/*.class</includes>
+          <excludes>**/entities/**/XML*.class,**/entities/**/*PK.class,**/*PK.class</excludes>
           <addDefaultConstructor>true</addDefaultConstructor>
           <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
           <persistenceXmlFile>${project.basedir}/src/main/resources/META-INF/persistence.xml</persistenceXmlFile>
@@ -537,13 +529,17 @@ under the License.
           <systemPropertyVariables>
             <credential.module.directory>${basedir}</credential.module.directory>
           </systemPropertyVariables>
+          <environmentVariables>
+            <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
+          </environmentVariables>
+          <argLine>-Dapi.version=1.43</argLine>
           <excludes>
             <exclude>**/DAOBaseTestCase.java</exclude>
             <exclude>**/MappingDAOTest.java</exclude>
           </excludes>
           <!-- Exclude @Tag("integration") tests by default — they require Docker.
-               Run with: mvn test -Dgroups=integration -DexcludedGroups="" -->
-          <excludedGroups>integration</excludedGroups>
+               Run with: mvn test -Dgroups=integration -Dsurefire.excludedGroups="" -->
+          <excludedGroups>${surefire.excludedGroups}</excludedGroups>
         </configuration>
       </plugin>
 
@@ -658,6 +654,7 @@ under the License.
   </build>
 
   <properties>
+    <surefire.excludedGroups>integration</surefire.excludedGroups>
     <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
     <docker.api.server.image.src.root>src/main/docker</docker.api.server.image.src.root>
     <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/config/ServerSettings.java b/airavata-api/src/main/java/org/apache/airavata/common/config/ServerSettings.java
index b4f6c30e85..57d4e53975 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/config/ServerSettings.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/config/ServerSettings.java
@@ -274,13 +274,13 @@ public class ServerSettings extends ApplicationSettings {
     public static String getComputeResourceSelectionPolicyClass() throws ApplicationSettingsException {
         return getSetting(
                 COMPUTE_RESOURCE_SELECTION_POLICY_CLASS,
-                "org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection.MultipleComputeResourcePolicy");
+                "org.apache.airavata.execution.scheduler.MultipleComputeResourcePolicy");
     }
 
     public static String getReSchedulerPolicyClass() throws ApplicationSettingsException {
         return getSetting(
                 COMPUTE_RESOURCE_RESCHEDULER_CLASS,
-                "org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler.ExponentialBackOffReScheduler");
+                "org.apache.airavata.execution.scheduler.ExponentialBackOffReScheduler");
     }
 
     public static String getMetaschedulerGateway() throws ApplicationSettingsException {
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/db/DerbyUtil.java b/airavata-api/src/main/java/org/apache/airavata/common/db/DerbyUtil.java
deleted file mode 100644
index 4a1d6ca9e5..0000000000
--- a/airavata-api/src/main/java/org/apache/airavata/common/db/DerbyUtil.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.airavata.common.db;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import org.apache.derby.drda.NetworkServerControl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class includes methods to start stop Derby database. Mainly used for tests.
- */
-public class DerbyUtil {
-
-    private static NetworkServerControl server;
-
-    private static final Logger logger = LoggerFactory.getLogger(DerbyUtil.class);
-
-    public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
-
-    /**
-     * Starts new derby server instance with given configurations.
-     *
-     * @param hostAddress
-     *            The host address start the server.
-     * @param port
-     *            The port number which server is starting.
-     * @param user
-     *            JDBC user name.
-     * @param password
-     *            JDBC password.
-     * @throws Exception
-     *             If an error occurred while starting the server.
-     */
-    public static void startDerbyInServerMode(String hostAddress, int port, String user, String password)
-            throws Exception {
-        PrintWriter consoleWriter = null;
-
-        try {
-            System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "true");
-            server = new NetworkServerControl(InetAddress.getByName(hostAddress), port, user, password);
-            consoleWriter = new PrintWriter(System.out, true);
-            server.start(consoleWriter);
-
-        } catch (IOException e) {
-            logger.error(
-                    "Unable to start Apache derby in the server mode! Check whether " + "specified port is available",
-                    e);
-            throw e;
-        } catch (Exception e) {
-            logger.error(
-                    "Unable to start Apache derby in the server mode! Check whether " + "specified port is available",
-                    e);
-            throw e;
-        } finally {
-
-            if (consoleWriter != null) {
-                consoleWriter.close();
-            }
-        }
-    }
-
-    /**
-     * Starts derby server in embedded mode.
-     *
-     * @throws ClassNotFoundException
-     *             If specified driver not found in the class path.
-     * @throws SQLException
-     *             If an error occurred while creat
-     */
-    public static void startDerbyInEmbeddedMode() throws ClassNotFoundException, SQLException {
-        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-        DriverManager.getConnection("jdbc:derby:memory:unit-testing-jpa;create=true")
-                .close();
-    }
-
-    /**
-     * Shuts down the server.
-     *
-     * @throws Exception
-     *             If an error occurred while shutting down.
-     */
-    public static void stopDerbyServer() throws Exception {
-        try {
-            server.shutdown();
-        } catch (Exception e) {
-            logger.error("Error shutting down derby server.", e);
-            throw e;
-        }
-    }
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/server/KeyStorePasswordCallback.java b/airavata-api/src/main/java/org/apache/airavata/common/server/KeyStorePasswordCallback.java
index 9daa9ea3b5..4fcef4303e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/server/KeyStorePasswordCallback.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/server/KeyStorePasswordCallback.java
@@ -18,25 +18,25 @@
 * under the License.
 */
 package org.apache.airavata.common.server; /*
-                                           *
-                                           * Licensed to the Apache Software Foundation (ASF) under one
-                                           * or more contributor license agreements.  See the NOTICE file
-                                           * distributed with this work for additional information
-                                           * regarding copyright ownership.  The ASF licenses this file
-                                           * to you under the Apache License, Version 2.0 (the
-                                           * "License"); you may not use this file except in compliance
-                                           * with the License.  You may obtain a copy of the License at
-                                           *
-                                           *   http://www.apache.org/licenses/LICENSE-2.0
-                                           *
-                                           * Unless required by applicable law or agreed to in writing,
-                                           * software distributed under the License is distributed on an
-                                           * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-                                           * KIND, either express or implied.  See the License for the
-                                           * specific language governing permissions and limitations
-                                           * under the License.
-                                           *
-                                           */
+                                            *
+                                            * Licensed to the Apache Software Foundation (ASF) under one
+                                            * or more contributor license agreements.  See the NOTICE file
+                                            * distributed with this work for additional information
+                                            * regarding copyright ownership.  The ASF licenses this file
+                                            * to you under the Apache License, Version 2.0 (the
+                                            * "License"); you may not use this file except in compliance
+                                            * with the License.  You may obtain a copy of the License at
+                                            *
+                                            *   http://www.apache.org/licenses/LICENSE-2.0
+                                            *
+                                            * Unless required by applicable law or agreed to in writing,
+                                            * software distributed under the License is distributed on an
+                                            * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+                                            * KIND, either express or implied.  See the License for the
+                                            * specific language governing permissions and limitations
+                                            * under the License.
+                                            *
+                                            */
 
 /**
  * User: AmilaJ (amilaj@apache.org)
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/server/MonitoringServer.java b/airavata-api/src/main/java/org/apache/airavata/common/server/MonitoringServer.java
index ef8c384c0d..c9e0459b27 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/server/MonitoringServer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/server/MonitoringServer.java
@@ -30,7 +30,6 @@ import java.io.StringWriter;
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import org.apache.airavata.common.server.IServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/server/ServiceRegistry.java b/airavata-api/src/main/java/org/apache/airavata/common/server/ServiceRegistry.java
index cc764d6f5c..1793c2268d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/server/ServiceRegistry.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/server/ServiceRegistry.java
@@ -22,7 +22,6 @@ package org.apache.airavata.common.server;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
-import org.apache.airavata.common.server.IServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/util/AiravataClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/common/util/AiravataClientFactory.java
index 6e85694cc2..3e45463333 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/util/AiravataClientFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/util/AiravataClientFactory.java
@@ -24,9 +24,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.api.Airavata;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.Constants;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.model.security.AuthzToken;
 import org.apache.thrift.TException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/AppCatAbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/AppCatAbstractRepository.java
index d8b01f1aba..4a90231a1c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/AppCatAbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/AppCatAbstractRepository.java
@@ -20,8 +20,8 @@
 package org.apache.airavata.compute.repository;
 
 import jakarta.persistence.EntityManager;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.apache.airavata.registry.core.utils.JPAUtil.AppCatalogJPAUtils;
+import org.apache.airavata.execution.util.AbstractRepository;
+import org.apache.airavata.execution.util.AppCatalogJPAUtils;
 
 public class AppCatAbstractRepository<T, E, Id> extends AbstractRepository<T, E, Id> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationDeploymentRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationDeploymentRepository.java
index 2621d2cf1f..32095be88c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationDeploymentRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationDeploymentRepository.java
@@ -22,15 +22,15 @@ package org.apache.airavata.compute.repository;
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.*;
+import org.apache.airavata.compute.model.ApplicationDeploymentEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.ApplicationDeployment;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
-import org.apache.airavata.compute.model.ApplicationDeploymentEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.ApplicationDeployment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInputRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInputRepository.java
index cc5c99d336..7562cbdaaf 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInputRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.compute.model.ApplicationInputEntity;
 import org.apache.airavata.compute.model.ApplicationInputPK;
+import org.apache.airavata.model.application.io.InputDataObjectType;
 
 public class ApplicationInputRepository
         extends AppCatAbstractRepository<InputDataObjectType, ApplicationInputEntity, ApplicationInputPK> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInterfaceRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInterfaceRepository.java
index 716dc5830b..e0a567cb95 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInterfaceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationInterfaceRepository.java
@@ -23,19 +23,19 @@ import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.*;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.compute.model.AppModuleMappingEntity;
+import org.apache.airavata.compute.model.ApplicationInterfaceEntity;
+import org.apache.airavata.compute.model.ApplicationModuleEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.ApplicationInterface;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
-import org.apache.airavata.compute.model.AppModuleMappingEntity;
-import org.apache.airavata.compute.model.ApplicationInterfaceEntity;
-import org.apache.airavata.compute.model.ApplicationModuleEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.ApplicationInterface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationModuleRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationModuleRepository.java
index 51740a73b0..0728319391 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationModuleRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationModuleRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.compute.model.ApplicationModuleEntity;
+import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 
 public class ApplicationModuleRepository
         extends AppCatAbstractRepository<ApplicationModule, ApplicationModuleEntity, String> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationOutputRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationOutputRepository.java
index 4b5b0be5b9..df7aaf3cf4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationOutputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ApplicationOutputRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.compute.model.ApplicationOutputEntity;
 import org.apache.airavata.compute.model.ApplicationOutputPK;
+import org.apache.airavata.model.application.io.OutputDataObjectType;
 
 public class ApplicationOutputRepository
         extends AppCatAbstractRepository<OutputDataObjectType, ApplicationOutputEntity, ApplicationOutputPK> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueuePolicyRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueuePolicyRepository.java
index ee7d5ca18c..3afc55e52b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueuePolicyRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueuePolicyRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResourcePolicy;
 import org.apache.airavata.compute.model.BatchQueueResourcePolicyEntity;
+import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResourcePolicy;
 
 /**
  * Created by skariyat on 2/10/18.
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueueRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueueRepository.java
index 85092e8ac7..db0fcbce55 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueueRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/BatchQueueRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
 import org.apache.airavata.compute.model.BatchQueueEntity;
 import org.apache.airavata.compute.model.BatchQueuePK;
+import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
 
 public class BatchQueueRepository extends AppCatAbstractRepository<BatchQueue, BatchQueueEntity, BatchQueuePK> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePolicyRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePolicyRepository.java
index e2725638dc..aea09855f6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePolicyRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePolicyRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
 import org.apache.airavata.compute.model.ComputeResourcePolicyEntity;
+import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
 
 /**
  * Created by skariyat on 2/10/18.
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePrefRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePrefRepository.java
index 7a21a36725..6f7b0c0079 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePrefRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourcePrefRepository.java
@@ -21,10 +21,10 @@ package org.apache.airavata.compute.repository;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 import org.apache.airavata.compute.model.ComputeResourcePreferenceEntity;
 import org.apache.airavata.compute.model.ComputeResourcePreferencePK;
 import org.apache.airavata.compute.model.SSHAccountProvisionerConfiguration;
+import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 
 public class ComputeResourcePrefRepository
         extends AppCatAbstractRepository<
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourceRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourceRepository.java
index c7e8bfbdb7..4abec829f5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ComputeResourceRepository.java
@@ -26,6 +26,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.compute.model.BatchQueuePK;
+import org.apache.airavata.compute.model.CloudJobSubmissionEntity;
+import org.apache.airavata.compute.model.ComputeResourceEntity;
+import org.apache.airavata.compute.model.ComputeResourceFileSystemEntity;
+import org.apache.airavata.compute.model.JobSubmissionInterfacePK;
+import org.apache.airavata.compute.model.LocalSubmissionEntity;
+import org.apache.airavata.compute.model.ResourceJobManagerEntity;
+import org.apache.airavata.compute.model.SshJobSubmissionEntity;
+import org.apache.airavata.compute.model.UnicoreSubmissionEntity;
+import org.apache.airavata.execution.util.AppCatalogUtils;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.ComputeResource;
 import org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
@@ -44,28 +59,13 @@ import org.apache.airavata.model.data.movement.LOCALDataMovement;
 import org.apache.airavata.model.data.movement.SCPDataMovement;
 import org.apache.airavata.model.data.movement.UnicoreDataMovement;
 import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import org.apache.airavata.compute.model.BatchQueuePK;
-import org.apache.airavata.compute.model.CloudJobSubmissionEntity;
-import org.apache.airavata.compute.model.ComputeResourceEntity;
-import org.apache.airavata.compute.model.ComputeResourceFileSystemEntity;
 import org.apache.airavata.storage.model.DataMovementInterfacePK;
 import org.apache.airavata.storage.model.GridftpDataMovementEntity;
 import org.apache.airavata.storage.model.GridftpEndpointEntity;
-import org.apache.airavata.compute.model.JobSubmissionInterfacePK;
 import org.apache.airavata.storage.model.LocalDataMovementEntity;
-import org.apache.airavata.compute.model.LocalSubmissionEntity;
-import org.apache.airavata.compute.model.ResourceJobManagerEntity;
 import org.apache.airavata.storage.model.ScpDataMovementEntity;
-import org.apache.airavata.compute.model.SshJobSubmissionEntity;
 import org.apache.airavata.storage.model.UnicoreDatamovementEntity;
-import org.apache.airavata.compute.model.UnicoreSubmissionEntity;
-import org.apache.airavata.registry.core.utils.AppCatalogUtils;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
 import org.apache.airavata.storage.repository.DataMovementRepository;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.ComputeResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GatewayGroupsRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GatewayGroupsRepository.java
index 9f7133e0eb..43044a17b5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GatewayGroupsRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GatewayGroupsRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.compute.model.GatewayGroupsEntity;
+import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 
 public class GatewayGroupsRepository extends AppCatAbstractRepository<GatewayGroups, GatewayGroupsEntity, String> {
     public GatewayGroupsRepository() {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GroupResourceProfileRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GroupResourceProfileRepository.java
index 32c31e9cf6..3db81dfe48 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GroupResourceProfileRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GroupResourceProfileRepository.java
@@ -26,6 +26,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity;
+import org.apache.airavata.compute.model.ComputeResourceReservationEntity;
+import org.apache.airavata.compute.model.GroupComputeResourcePrefEntity;
+import org.apache.airavata.compute.model.GroupComputeResourcePrefPK;
+import org.apache.airavata.compute.model.GroupResourceProfileEntity;
+import org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.QueryConstants;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.AwsComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResourcePolicy;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
@@ -34,14 +42,6 @@ import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourcePr
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.SlurmComputeResourcePreference;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
-import org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity;
-import org.apache.airavata.compute.model.ComputeResourceReservationEntity;
-import org.apache.airavata.compute.model.GroupComputeResourcePrefEntity;
-import org.apache.airavata.compute.model.GroupComputeResourcePrefPK;
-import org.apache.airavata.compute.model.GroupResourceProfileEntity;
-import org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.QueryConstants;
 
 /**
  * Created by skariyat on 2/8/18.
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GrpComputePrefRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GrpComputePrefRepository.java
index a954a3640b..22dee83d40 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GrpComputePrefRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GrpComputePrefRepository.java
@@ -19,15 +19,15 @@
 */
 package org.apache.airavata.compute.repository;
 
+import org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity;
+import org.apache.airavata.compute.model.GroupComputeResourcePrefEntity;
+import org.apache.airavata.compute.model.GroupComputeResourcePrefPK;
+import org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.AwsComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.EnvironmentSpecificPreferences;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.SlurmComputeResourcePreference;
-import org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity;
-import org.apache.airavata.compute.model.GroupComputeResourcePrefEntity;
-import org.apache.airavata.compute.model.GroupComputeResourcePrefPK;
-import org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity;
 
 /**
  * Created by skariyat on 2/10/18.
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GwyResourceProfileRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GwyResourceProfileRepository.java
index a6fc22a494..4b5b8c49ac 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/GwyResourceProfileRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/GwyResourceProfileRepository.java
@@ -25,17 +25,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.compute.model.*;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.GwyResourceProfile;
 import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
-import org.apache.airavata.compute.model.*;
 import org.apache.airavata.storage.model.StoragePreferencePK;
 import org.apache.airavata.storage.repository.StoragePrefRepository;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.GwyResourceProfile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepository.java
index 7adc5f1066..4ebc3ca670 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepository.java
@@ -20,10 +20,10 @@
 package org.apache.airavata.compute.repository;
 
 import com.github.dozermapper.core.Mapper;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
 import org.apache.airavata.compute.model.JobSubmissionInterfaceEntity;
 import org.apache.airavata.compute.model.JobSubmissionInterfacePK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
 
 public class JobSubmissionInterfaceRepository
         extends AppCatAbstractRepository<
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserInputRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserInputRepository.java
index 2a799e0db2..5f109049b0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserInputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserInputRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.parser.ParserInput;
 import org.apache.airavata.compute.model.ParserInputEntity;
-import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.model.appcatalog.parser.ParserInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserOutputRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserOutputRepository.java
index c76495ca2a..3875dd91dd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserOutputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserOutputRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.parser.ParserOutput;
 import org.apache.airavata.compute.model.ParserOutputEntity;
-import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.model.appcatalog.parser.ParserOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserRepository.java
index b11e9c6176..57e1042934 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParserRepository.java
@@ -23,12 +23,12 @@ import com.github.dozermapper.core.Mapper;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.model.appcatalog.parser.Parser;
 import org.apache.airavata.compute.model.ParserEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.model.appcatalog.parser.Parser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParsingTemplateRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParsingTemplateRepository.java
index 940b28801c..f960b1fad3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParsingTemplateRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ParsingTemplateRepository.java
@@ -22,10 +22,10 @@ package org.apache.airavata.compute.repository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.model.appcatalog.parser.ParsingTemplate;
 import org.apache.airavata.compute.model.ParsingTemplateEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.QueryConstants;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.model.appcatalog.parser.ParsingTemplate;
 
 public class ParsingTemplateRepository
         extends AppCatAbstractRepository<ParsingTemplate, ParsingTemplateEntity, String> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ResourceJobManagerRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ResourceJobManagerRepository.java
index ee190edba1..13e37eef9b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/ResourceJobManagerRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/ResourceJobManagerRepository.java
@@ -23,12 +23,12 @@ import jakarta.persistence.Query;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.compute.model.*;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.QueryConstants;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
 import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import org.apache.airavata.compute.model.*;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.QueryConstants;
 
 public class ResourceJobManagerRepository
         extends AppCatAbstractRepository<ResourceJobManager, ResourceJobManagerEntity, String> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserComputeResourcePreferenceRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserComputeResourcePreferenceRepository.java
index 43cc1f23dc..88798053a4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserComputeResourcePreferenceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserComputeResourcePreferenceRepository.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.compute.repository;
 
-import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
 import org.apache.airavata.compute.model.UserComputeResourcePreferenceEntity;
 import org.apache.airavata.compute.model.UserComputeResourcePreferencePK;
+import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
 
 public class UserComputeResourcePreferenceRepository
         extends AppCatAbstractRepository<
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserResourceProfileRepository.java b/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserResourceProfileRepository.java
index 0f526a66f9..01660450a9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserResourceProfileRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/repository/UserResourceProfileRepository.java
@@ -22,19 +22,19 @@ package org.apache.airavata.compute.repository;
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.*;
-import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile;
-import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference;
 import org.apache.airavata.compute.model.UserComputeResourcePreferencePK;
 import org.apache.airavata.compute.model.UserResourceProfileEntity;
 import org.apache.airavata.compute.model.UserResourceProfilePK;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.UsrResourceProfile;
+import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
+import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile;
+import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference;
 import org.apache.airavata.storage.model.UserStoragePreferencePK;
 import org.apache.airavata.storage.repository.UserStoragePreferenceRepository;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.UsrResourceProfile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/ApplicationCatalogService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/ApplicationCatalogService.java
index b23a3db7b3..ffc3407b26 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/ApplicationCatalogService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/ApplicationCatalogService.java
@@ -23,6 +23,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.credential.handler.CredentialStoreServerHandler;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceAuthorizationException;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -33,16 +37,12 @@ import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.group.ResourcePermissionType;
 import org.apache.airavata.model.group.ResourceType;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
 import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/GatewayResourceProfileService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/GatewayResourceProfileService.java
index f35b4066dd..cc74efc425 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/GatewayResourceProfileService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/GatewayResourceProfileService.java
@@ -24,15 +24,15 @@ import java.util.List;
 import org.apache.airavata.credential.service.provisioning.ConfigParam;
 import org.apache.airavata.credential.service.provisioning.SSHAccountProvisionerFactory;
 import org.apache.airavata.credential.service.provisioning.SSHAccountProvisionerProvider;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType;
 import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/GroupResourceProfileService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/GroupResourceProfileService.java
index 6df073de7c..1ac3a72647 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/GroupResourceProfileService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/GroupResourceProfileService.java
@@ -23,6 +23,10 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceAuthorizationException;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResourcePolicy;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
@@ -30,16 +34,12 @@ import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeRes
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
 import org.apache.airavata.model.group.ResourcePermissionType;
 import org.apache.airavata.model.group.ResourceType;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
 import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/ParserService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/ParserService.java
index 185e7f5e43..3c208d7275 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/ParserService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/ParserService.java
@@ -20,11 +20,11 @@
 package org.apache.airavata.compute.service;
 
 import java.util.List;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.parser.Parser;
 import org.apache.airavata.model.appcatalog.parser.ParsingTemplate;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/ResourceService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/ResourceService.java
index 89882f0198..b631356018 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/ResourceService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/ResourceService.java
@@ -24,7 +24,11 @@ import java.util.Map;
 import java.util.Optional;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.AgentException;
-import org.apache.airavata.helix.core.support.adaptor.AdaptorSupportImpl;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.orchestrator.AdaptorSupportImpl;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceAuthorizationException;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
@@ -41,11 +45,6 @@ import org.apache.airavata.model.data.movement.GridFTPDataMovement;
 import org.apache.airavata.model.data.movement.LOCALDataMovement;
 import org.apache.airavata.model.data.movement.SCPDataMovement;
 import org.apache.airavata.model.data.movement.UnicoreDataMovement;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.compute.service.GroupResourceProfileService;
 import org.apache.thrift.TApplicationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/service/UserResourceProfileService.java b/airavata-api/src/main/java/org/apache/airavata/compute/service/UserResourceProfileService.java
index da5c17ae47..bddecc91bd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/service/UserResourceProfileService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/service/UserResourceProfileService.java
@@ -20,13 +20,13 @@
 package org.apache.airavata.compute.service;
 
 import java.util.List;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference;
 import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/AiravataCustomCommandOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/AiravataCustomCommandOutputParser.java
index f5dcb5bed2..c6fb6de08f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/AiravataCustomCommandOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/AiravataCustomCommandOutputParser.java
@@ -20,7 +20,6 @@
 package org.apache.airavata.compute.task;
 
 import java.util.Map;
-import org.apache.airavata.compute.task.OutputParser;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/CloudJobManagerConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/CloudJobManagerConfiguration.java
index df4e244fcd..2032daf984 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/CloudJobManagerConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/CloudJobManagerConfiguration.java
@@ -20,10 +20,6 @@
 package org.apache.airavata.compute.task;
 
 import java.io.File;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
-import org.apache.airavata.compute.task.AiravataCustomCommandOutputParser;
 import org.apache.commons.io.FilenameUtils;
 
 /**
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/DefaultJobSubmissionTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/DefaultJobSubmissionTask.java
index 1fbdedd4d6..176797a278 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/DefaultJobSubmissionTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/DefaultJobSubmissionTask.java
@@ -21,19 +21,17 @@ package org.apache.airavata.compute.task;
 
 import java.io.*;
 import java.util.*;
+import org.apache.airavata.common.server.CountMonitor;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.JobSubmissionOutput;
-import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.GroovyMapBuilder;
-import org.apache.airavata.compute.task.GroovyMapData;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.commons.ErrorModel;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.*;
 import org.apache.airavata.model.workspace.GatewayUsageReportingCommand;
-import org.apache.airavata.common.server.CountMonitor;
 import org.apache.helix.task.TaskResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobConfiguration.java
index ddc5009a1b..75774fb0a6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobSubmissionTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobSubmissionTask.java
index 42ba64b697..246719f2d8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobSubmissionTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkJobSubmissionTask.java
@@ -20,14 +20,12 @@
 package org.apache.airavata.compute.task;
 
 import java.util.Collections;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.JobSubmissionOutput;
-import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.GroovyMapBuilder;
-import org.apache.airavata.compute.task.GroovyMapData;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkOutputParser.java
index a8a60e2c6a..9be6948c30 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/ForkOutputParser.java
@@ -21,7 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.compute.task.OutputParser;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/GroovyMapBuilder.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/GroovyMapBuilder.java
index 3601500749..b4b9c2787c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/GroovyMapBuilder.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/GroovyMapBuilder.java
@@ -29,8 +29,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.impl.task.TaskOnFailException;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskOnFailException;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
 import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorJobConfiguration.java
index 42d5bd9f89..5677078d80 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorOutputParser.java
index 64e4d66601..958954e0c5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/HTCondorOutputParser.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.JobUtil;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/JobFactory.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/JobFactory.java
index f76f7e3e66..ab58b536d2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/JobFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/JobFactory.java
@@ -19,11 +19,9 @@
 */
 package org.apache.airavata.compute.task;
 
-import org.apache.airavata.compute.task.*;
-import org.apache.airavata.compute.task.*;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.cpi.AppCatalogException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/JobSubmissionTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/JobSubmissionTask.java
index f2565b2bbd..6b659cf75b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/JobSubmissionTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/JobSubmissionTask.java
@@ -23,18 +23,14 @@ import java.io.File;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.AgentException;
 import org.apache.airavata.compute.util.CommandOutput;
 import org.apache.airavata.compute.util.JobSubmissionOutput;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.compute.task.GroovyMapData;
-import org.apache.airavata.compute.task.JobFactory;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.RawCommandInfo;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
 import org.apache.airavata.model.job.JobModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFJobConfiguration.java
index a8a56ae8a6..33013254d6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFOutputParser.java
index bb8d4b0249..bd9b47f79f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/LSFOutputParser.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.compute.task.OutputParser;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/LocalJobSubmissionTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/LocalJobSubmissionTask.java
index 2270e84e66..6a48639c13 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/LocalJobSubmissionTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/LocalJobSubmissionTask.java
@@ -21,10 +21,9 @@ package org.apache.airavata.compute.task;
 
 import java.util.UUID;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.GroovyMapData;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.helix.task.TaskResult;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSJobConfiguration.java
index c0b9362b8b..1f362c9b7a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSOutputParser.java
index c40c9a0c34..46042d212b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/PBSOutputParser.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.JobUtil;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmJobConfiguration.java
index f56b8d3b9f..36826e22a0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmOutputParser.java
index 539e9c8f74..3ae56d9ead 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/SlurmOutputParser.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.JobUtil;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEJobConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEJobConfiguration.java
index cc34d9eb94..24dc16cab6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEJobConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEJobConfiguration.java
@@ -21,9 +21,6 @@ package org.apache.airavata.compute.task;
 
 import java.io.File;
 import java.util.Map;
-import org.apache.airavata.compute.task.JobManagerConfiguration;
-import org.apache.airavata.compute.task.OutputParser;
-import org.apache.airavata.compute.task.RawCommandInfo;
 import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 import org.apache.commons.io.FilenameUtils;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEOutputParser.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEOutputParser.java
index b07dbd48e5..140f0edd3b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEOutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/UGEOutputParser.java
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.compute.task.OutputParser;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSCompletingTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSCompletingTask.java
index d5d0db7263..3d0d20da3b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSCompletingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSCompletingTask.java
@@ -19,11 +19,10 @@
 */
 package org.apache.airavata.compute.task.aws;
 
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.aws.AWSTaskUtil;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.helix.task.TaskResult;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSJobSubmissionTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSJobSubmissionTask.java
index 7f53e37072..7ba9f175d4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSJobSubmissionTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSJobSubmissionTask.java
@@ -24,21 +24,19 @@ import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
-import org.apache.airavata.compute.util.AgentUtils;
-import org.apache.airavata.compute.util.CommandOutput;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.compute.util.SSHJAgentAdaptor;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.aws.AWSTaskUtil;
-import org.apache.airavata.compute.task.aws.ExponentialBackoffWaiter;
-import org.apache.airavata.compute.task.JobSubmissionTask;
 import org.apache.airavata.compute.task.GroovyMapBuilder;
 import org.apache.airavata.compute.task.GroovyMapData;
 import org.apache.airavata.compute.task.JobFactory;
 import org.apache.airavata.compute.task.JobManagerConfiguration;
+import org.apache.airavata.compute.task.JobSubmissionTask;
 import org.apache.airavata.compute.task.RawCommandInfo;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.compute.util.AgentUtils;
+import org.apache.airavata.compute.util.CommandOutput;
+import org.apache.airavata.compute.util.SSHJAgentAdaptor;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.AwsComputeResourcePreference;
 import org.apache.airavata.model.credential.store.SSHCredential;
 import org.apache.airavata.model.job.JobModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSProcessContextManager.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSProcessContextManager.java
index 827ef2559b..f75786ddef 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSProcessContextManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSProcessContextManager.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.apache.airavata.compute.util.AgentException;
 import org.apache.airavata.compute.util.AgentUtils;
-import org.apache.airavata.helix.impl.task.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskContext;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.thrift.TException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSTaskUtil.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSTaskUtil.java
index ee45346d6c..c019d5d598 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSTaskUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/AWSTaskUtil.java
@@ -21,8 +21,7 @@ package org.apache.airavata.compute.task.aws;
 
 import java.util.concurrent.TimeUnit;
 import org.apache.airavata.compute.util.AgentUtils;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.aws.AWSProcessContextManager;
+import org.apache.airavata.execution.orchestrator.TaskContext;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.AwsComputeResourcePreference;
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/CreateEC2InstanceTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/CreateEC2InstanceTask.java
index 07082d70d1..d37561baf5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/CreateEC2InstanceTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/CreateEC2InstanceTask.java
@@ -23,11 +23,10 @@ import java.security.Security;
 import java.util.UUID;
 import org.apache.airavata.compute.util.AgentUtils;
 import org.apache.airavata.compute.util.SSHUtil;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.compute.task.aws.AWSTaskUtil;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.AwsComputeResourcePreference;
 import org.apache.airavata.model.credential.store.SSHCredential;
 import org.apache.helix.task.TaskResult;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/NoOperationTask.java b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/NoOperationTask.java
index ba23a6a177..0ba7eb422a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/NoOperationTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/task/aws/NoOperationTask.java
@@ -19,10 +19,10 @@
 */
 package org.apache.airavata.compute.task.aws;
 
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.helix.task.TaskResult;
 
 @TaskDef(name = "No Operation Task")
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/AgentUtils.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/AgentUtils.java
index 7624e02e72..5674786d00 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/AgentUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/AgentUtils.java
@@ -19,13 +19,13 @@
 */
 package org.apache.airavata.compute.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 
 public class AgentUtils {
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/PoolingSSHJClient.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/PoolingSSHJClient.java
index d88728d17f..c8c5c101c1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/PoolingSSHJClient.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/PoolingSSHJClient.java
@@ -36,10 +36,6 @@ import net.schmizz.sshj.transport.TransportException;
 import net.schmizz.sshj.transport.verification.HostKeyVerifier;
 import net.schmizz.sshj.userauth.UserAuthException;
 import net.schmizz.sshj.userauth.method.AuthMethod;
-import org.apache.airavata.compute.util.SCPFileTransferWrapper;
-import org.apache.airavata.compute.util.SFTPClientWrapper;
-import org.apache.airavata.compute.util.SSHClientWrapper;
-import org.apache.airavata.compute.util.SessionWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/SSHJAgentAdaptor.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/SSHJAgentAdaptor.java
index b35121ddd7..cbeedd190f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/SSHJAgentAdaptor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/SSHJAgentAdaptor.java
@@ -42,12 +42,6 @@ import net.schmizz.sshj.xfer.FilePermission;
 import net.schmizz.sshj.xfer.LocalDestFile;
 import net.schmizz.sshj.xfer.LocalFileFilter;
 import net.schmizz.sshj.xfer.LocalSourceFile;
-import org.apache.airavata.compute.util.*;
-import org.apache.airavata.storage.util.FileMetadata;
-import org.apache.airavata.compute.util.SCPFileTransferWrapper;
-import org.apache.airavata.compute.util.SFTPClientWrapper;
-import org.apache.airavata.compute.util.SessionWrapper;
-import org.apache.airavata.compute.util.StandardOutReader;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
@@ -55,6 +49,7 @@ import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
 import org.apache.airavata.model.appcatalog.storageresource.StorageDirectoryInfo;
 import org.apache.airavata.model.appcatalog.storageresource.StorageVolumeInfo;
 import org.apache.airavata.model.credential.store.SSHCredential;
+import org.apache.airavata.storage.util.FileMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAdaptorParams.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAdaptorParams.java
index 36552a6e71..3edf45f7ec 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAdaptorParams.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAdaptorParams.java
@@ -20,7 +20,6 @@
 package org.apache.airavata.compute.util;
 
 import java.io.*;
-import org.apache.airavata.compute.util.AdaptorParams;
 
 /**
  * TODO: Class level comments please
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAgentAdaptor.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAgentAdaptor.java
index ceae6f90bd..47154d9a0b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAgentAdaptor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/SshAgentAdaptor.java
@@ -24,12 +24,11 @@ import java.io.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import org.apache.airavata.compute.util.*;
-import org.apache.airavata.storage.util.FileMetadata;
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.appcatalog.storageresource.StorageDirectoryInfo;
 import org.apache.airavata.model.appcatalog.storageresource.StorageVolumeInfo;
 import org.apache.airavata.model.credential.store.SSHCredential;
+import org.apache.airavata.storage.util.FileMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/util/StandardOutReader.java b/airavata-api/src/main/java/org/apache/airavata/compute/util/StandardOutReader.java
index 515eaf25fc..7351c054a6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/util/StandardOutReader.java
+++ b/airavata-api/src/main/java/org/apache/airavata/compute/util/StandardOutReader.java
@@ -20,7 +20,6 @@
 package org.apache.airavata.compute.util;
 
 import java.io.*;
-import org.apache.airavata.compute.util.CommandOutput;
 import org.apache.commons.io.IOUtils;
 
 /**
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java b/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
index 9d4feeaf5d..f08ded5db4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
@@ -26,20 +26,20 @@ import java.security.cert.X509Certificate;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.db.DBInitializer;
 import org.apache.airavata.common.db.DBUtil;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.credential.store.cpi.CredentialStoreService;
-import org.apache.airavata.credential.store.cpi.credential_store_cpiConstants;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.credential.model.CommunityUser;
 import org.apache.airavata.credential.model.Credential;
 import org.apache.airavata.credential.model.CredentialOwnerType;
-import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.airavata.credential.repository.CertificateCredentialWriter;
 import org.apache.airavata.credential.repository.CredentialReaderImpl;
+import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.airavata.credential.repository.SSHCredentialWriter;
 import org.apache.airavata.credential.repository.util.CredentialStoreDBInitConfig;
+import org.apache.airavata.credential.store.cpi.CredentialStoreService;
+import org.apache.airavata.credential.store.cpi.credential_store_cpiConstants;
 import org.apache.airavata.credential.util.TokenGenerator;
 import org.apache.airavata.credential.util.Utility;
 import org.apache.airavata.model.credential.store.*;
@@ -187,9 +187,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
         try {
             Credential credential = credentialReader.getCredential(gatewayId, tokenId);
             if (credential instanceof org.apache.airavata.credential.model.SSHCredential
-                    && !(credential
-                            instanceof
-                            org.apache.airavata.credential.model.PasswordCredential)) {
+                    && !(credential instanceof org.apache.airavata.credential.model.PasswordCredential)) {
                 org.apache.airavata.credential.model.SSHCredential credential1 =
                         (org.apache.airavata.credential.model.SSHCredential) credential;
                 SSHCredential sshCredential = new SSHCredential();
@@ -225,15 +223,12 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
         try {
             Credential credential = credentialReader.getCredential(gatewayId, tokenId);
             if (isSSHCredential(credential)) {
-                return convertToCredentialSummary(
-                        (org.apache.airavata.credential.model.SSHCredential) credential);
+                return convertToCredentialSummary((org.apache.airavata.credential.model.SSHCredential) credential);
             } else if (isCertificateCredential(credential)) {
                 return convertToCredentialSummary(
-                        (org.apache.airavata.credential.model.CertificateCredential)
-                                credential);
+                        (org.apache.airavata.credential.model.CertificateCredential) credential);
             } else if (isPasswordCredential(credential)) {
-                return convertToCredentialSummary(
-                        (org.apache.airavata.credential.model.PasswordCredential) credential);
+                return convertToCredentialSummary((org.apache.airavata.credential.model.PasswordCredential) credential);
             }
             throw new org.apache.airavata.credential.store.exception.CredentialStoreException(
                     "Unrecognized type of credential for token: " + tokenId);
@@ -261,16 +256,13 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
             } else if (type.equals(SummaryType.CERT)) {
                 return credentials.stream()
                         .filter(this::isCertificateCredential)
-                        .map(cred ->
-                                (org.apache.airavata.credential.model.CertificateCredential)
-                                        cred)
+                        .map(cred -> (org.apache.airavata.credential.model.CertificateCredential) cred)
                         .map(cred -> convertToCredentialSummary(cred))
                         .collect(Collectors.toList());
             } else if (type.equals(SummaryType.PASSWD)) {
                 return credentials.stream()
                         .filter(this::isPasswordCredential)
-                        .map(cred ->
-                                (org.apache.airavata.credential.model.PasswordCredential) cred)
+                        .map(cred -> (org.apache.airavata.credential.model.PasswordCredential) cred)
                         .map(cred -> convertToCredentialSummary(cred))
                         .collect(Collectors.toList());
             } else {
@@ -297,8 +289,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
         return cred instanceof org.apache.airavata.credential.model.PasswordCredential;
     }
 
-    private CredentialSummary convertToCredentialSummary(
-            org.apache.airavata.credential.model.SSHCredential cred) {
+    private CredentialSummary convertToCredentialSummary(org.apache.airavata.credential.model.SSHCredential cred) {
         CredentialSummary credentialSummary = new CredentialSummary();
         credentialSummary.setType(SummaryType.SSH);
         credentialSummary.setUsername(cred.getPortalUserName());
@@ -325,8 +316,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
         return credentialSummary;
     }
 
-    private CredentialSummary convertToCredentialSummary(
-            org.apache.airavata.credential.model.PasswordCredential cred) {
+    private CredentialSummary convertToCredentialSummary(org.apache.airavata.credential.model.PasswordCredential cred) {
         CredentialSummary credentialSummary = new CredentialSummary();
         credentialSummary.setType(SummaryType.PASSWD);
         credentialSummary.setUsername(cred.getPortalUserName());
@@ -342,11 +332,9 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
             throws org.apache.airavata.credential.store.exception.CredentialStoreException, TException {
         try {
             Credential credential = credentialReader.getCredential(gatewayId, tokenId);
-            if (credential
-                    instanceof org.apache.airavata.credential.model.CertificateCredential) {
+            if (credential instanceof org.apache.airavata.credential.model.CertificateCredential) {
                 org.apache.airavata.credential.model.CertificateCredential credential1 =
-                        (org.apache.airavata.credential.model.CertificateCredential)
-                                credential;
+                        (org.apache.airavata.credential.model.CertificateCredential) credential;
                 CertificateCredential certificateCredential = new CertificateCredential();
                 org.apache.airavata.model.credential.store.CommunityUser communityUser =
                         new org.apache.airavata.model.credential.store.CommunityUser();
@@ -387,8 +375,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
             throws org.apache.airavata.credential.store.exception.CredentialStoreException, TException {
         try {
             Credential credential = credentialReader.getCredential(gatewayId, tokenId);
-            if (credential
-                    instanceof org.apache.airavata.credential.model.PasswordCredential) {
+            if (credential instanceof org.apache.airavata.credential.model.PasswordCredential) {
                 org.apache.airavata.credential.model.PasswordCredential credential1 =
                         (org.apache.airavata.credential.model.PasswordCredential) credential;
                 PasswordCredential pwdCredential = new PasswordCredential();
@@ -429,10 +416,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
                 if (allCredentials != null && !allCredentials.isEmpty()) {
                     for (Credential credential : allCredentials) {
                         if (credential instanceof org.apache.airavata.credential.model.SSHCredential
-                                && !(credential
-                                        instanceof
-                                        org.apache.airavata.credential.model
-                                                .PasswordCredential)
+                                && !(credential instanceof org.apache.airavata.credential.model.PasswordCredential)
                                 && credential.getCredentialOwnerType() == CredentialOwnerType.GATEWAY) {
                             org.apache.airavata.credential.model.SSHCredential sshCredential =
                                     (org.apache.airavata.credential.model.SSHCredential) credential;
@@ -472,10 +456,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
                 if (allCredentials != null && !allCredentials.isEmpty()) {
                     for (Credential credential : allCredentials) {
                         if (credential instanceof org.apache.airavata.credential.model.SSHCredential
-                                && !(credential
-                                        instanceof
-                                        org.apache.airavata.credential.model
-                                                .PasswordCredential)) {
+                                && !(credential instanceof org.apache.airavata.credential.model.PasswordCredential)) {
                             org.apache.airavata.credential.model.SSHCredential sshCredential =
                                     (org.apache.airavata.credential.model.SSHCredential) credential;
                             String portalUserName = sshCredential.getPortalUserName();
@@ -484,11 +465,8 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
                                 if (portalUserName.equals(userId)
                                         && gateway.equals(gatewayId)
                                         && sshCredential.getCredentialOwnerType() == CredentialOwnerType.USER) {
-                                    org.apache.airavata.credential.model.SSHCredential
-                                            sshCredentialKey =
-                                                    (org.apache.airavata.credential.model
-                                                                    .SSHCredential)
-                                                            credential;
+                                    org.apache.airavata.credential.model.SSHCredential sshCredentialKey =
+                                            (org.apache.airavata.credential.model.SSHCredential) credential;
                                     CredentialSummary sshCredentialSummary = new CredentialSummary();
                                     sshCredentialSummary.setType(SummaryType.SSH);
                                     sshCredentialSummary.setToken(sshCredentialKey.getToken());
@@ -524,12 +502,9 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
             List<Credential> allCredentials = credentialReader.getAllCredentialsPerGateway(gatewayId);
             if (allCredentials != null && !allCredentials.isEmpty()) {
                 for (Credential credential : allCredentials) {
-                    if (credential
-                            instanceof
-                            org.apache.airavata.credential.model.PasswordCredential) {
+                    if (credential instanceof org.apache.airavata.credential.model.PasswordCredential) {
                         org.apache.airavata.credential.model.PasswordCredential pwdCredential =
-                                (org.apache.airavata.credential.model.PasswordCredential)
-                                        credential;
+                                (org.apache.airavata.credential.model.PasswordCredential) credential;
                         pwdCredMap.put(
                                 pwdCredential.getToken(),
                                 pwdCredential.getDescription() == null ? "" : pwdCredential.getDescription());
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateAuditInfo.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateAuditInfo.java
index a48d134257..daea83aa07 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateAuditInfo.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateAuditInfo.java
@@ -21,8 +21,6 @@ package org.apache.airavata.credential.model;
 
 import java.util.Date;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.airavata.credential.model.AuditInfo;
-import org.apache.airavata.credential.model.CommunityUser;
 
 /**
  * Audit information related to community credential.
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateCredential.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateCredential.java
index e23c199646..b81be4e458 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateCredential.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/model/CertificateCredential.java
@@ -21,8 +21,6 @@ package org.apache.airavata.credential.model;
 
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
-import org.apache.airavata.credential.model.CommunityUser;
-import org.apache.airavata.credential.model.Credential;
 
 /**
  * Represents the certificate credentials.
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/PasswordCredential.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/PasswordCredential.java
index 38b085cb9c..f3d72acce7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/PasswordCredential.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/model/PasswordCredential.java
@@ -19,8 +19,6 @@
 */
 package org.apache.airavata.credential.model;
 
-import org.apache.airavata.credential.model.SSHCredential;
-
 /**
  * User name password credentials.
  */
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/SSHCredential.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/SSHCredential.java
index c54bb94917..588aaa0e76 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/SSHCredential.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/model/SSHCredential.java
@@ -20,7 +20,6 @@
 package org.apache.airavata.credential.model;
 
 import java.io.Serializable;
-import org.apache.airavata.credential.model.Credential;
 
 /**
  * An SSH Credential class which is an extension of Airavata Credential
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CertificateCredentialWriter.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CertificateCredentialWriter.java
index 14deebfe34..f6f5d115e2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CertificateCredentialWriter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CertificateCredentialWriter.java
@@ -21,15 +21,13 @@ package org.apache.airavata.credential.repository;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ApplicationSettings;
 import org.apache.airavata.common.db.DBUtil;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.DefaultKeyStorePasswordCallback;
+import org.apache.airavata.credential.model.CertificateCredential;
 import org.apache.airavata.credential.model.CommunityUser;
 import org.apache.airavata.credential.model.Credential;
-import org.apache.airavata.credential.model.CertificateCredential;
-import org.apache.airavata.credential.repository.CredentialStoreException;
-import org.apache.airavata.credential.repository.CredentialWriter;
 import org.apache.airavata.credential.repository.db.CommunityUserDAO;
 import org.apache.airavata.credential.repository.db.CredentialsDAO;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderFactory.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderFactory.java
index 681f5e05a2..212c9cad8e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderFactory.java
@@ -19,9 +19,8 @@
 */
 package org.apache.airavata.credential.repository;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.db.DBUtil;
-import org.apache.airavata.credential.repository.CredentialReaderImpl;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 /**
  * Factory class to create credential store readers.
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderImpl.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderImpl.java
index 79f0a39262..6b13860b2f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/CredentialReaderImpl.java
@@ -23,16 +23,14 @@ import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ApplicationSettings;
 import org.apache.airavata.common.db.DBUtil;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.DefaultKeyStorePasswordCallback;
-import org.apache.airavata.credential.model.CommunityUser;
-import org.apache.airavata.credential.model.Credential;
 import org.apache.airavata.credential.model.CertificateAuditInfo;
 import org.apache.airavata.credential.model.CertificateCredential;
-import org.apache.airavata.credential.repository.CredentialReader;
-import org.apache.airavata.credential.repository.CredentialStoreException;
+import org.apache.airavata.credential.model.CommunityUser;
+import org.apache.airavata.credential.model.Credential;
 import org.apache.airavata.credential.repository.db.CredentialsDAO;
 
 /**
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/SSHCredentialWriter.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/SSHCredentialWriter.java
index cf5eacb2df..dda5a9b55f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/SSHCredentialWriter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/SSHCredentialWriter.java
@@ -21,14 +21,12 @@ package org.apache.airavata.credential.repository;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ApplicationSettings;
 import org.apache.airavata.common.db.DBUtil;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.DefaultKeyStorePasswordCallback;
 import org.apache.airavata.credential.model.Credential;
 import org.apache.airavata.credential.model.SSHCredential;
-import org.apache.airavata.credential.repository.CredentialStoreException;
-import org.apache.airavata.credential.repository.CredentialWriter;
 import org.apache.airavata.credential.repository.db.CredentialsDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
index bf33f6b95a..f464b32bc4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
@@ -28,10 +28,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.airavata.common.db.DBUtil;
 import org.apache.airavata.common.server.KeyStorePasswordCallback;
-import org.apache.airavata.security.util.SecurityUtil;
 import org.apache.airavata.credential.model.Credential;
 import org.apache.airavata.credential.model.CredentialOwnerType;
 import org.apache.airavata.credential.repository.CredentialStoreException;
+import org.apache.airavata.security.util.SecurityUtil;
 
 /**
  * Data access class for credential store.
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/util/CredentialStoreJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/util/CredentialStoreJDBCConfig.java
index 54a458b178..9d96d9d723 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/util/CredentialStoreJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/util/CredentialStoreJDBCConfig.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.credential.repository.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class CredentialStoreJDBCConfig implements JDBCConfig {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/service/CredentialService.java b/airavata-api/src/main/java/org/apache/airavata/credential/service/CredentialService.java
index 4d8cd0091a..d3089d4056 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/service/CredentialService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/service/CredentialService.java
@@ -23,21 +23,21 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.airavata.credential.handler.CredentialStoreServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceAuthorizationException;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.credential.store.CredentialSummary;
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.apache.airavata.model.credential.store.SSHCredential;
 import org.apache.airavata.model.credential.store.SummaryType;
 import org.apache.airavata.model.group.ResourcePermissionType;
 import org.apache.airavata.model.group.ResourceType;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
 import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/service/SSHAccountService.java b/airavata-api/src/main/java/org/apache/airavata/credential/service/SSHAccountService.java
index 8880d563f0..824b70c99d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/service/SSHAccountService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/service/SSHAccountService.java
@@ -19,12 +19,12 @@
 */
 package org.apache.airavata.credential.service;
 
-import org.apache.airavata.credential.service.provisioning.SSHAccountManager;
 import org.apache.airavata.credential.handler.CredentialStoreServerHandler;
+import org.apache.airavata.credential.service.provisioning.SSHAccountManager;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
 import org.apache.airavata.model.credential.store.SSHCredential;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/service/provisioning/SSHAccountManager.java b/airavata-api/src/main/java/org/apache/airavata/credential/service/provisioning/SSHAccountManager.java
index 620e679063..0d5a2652f9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/service/provisioning/SSHAccountManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/service/provisioning/SSHAccountManager.java
@@ -24,11 +24,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
@@ -38,7 +39,6 @@ import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResou
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.apache.airavata.model.credential.store.SSHCredential;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/task/EnvSetupTask.java b/airavata-api/src/main/java/org/apache/airavata/credential/task/EnvSetupTask.java
index e0c7a46b62..582c2c4e8e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/task/EnvSetupTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/task/EnvSetupTask.java
@@ -19,13 +19,13 @@
 */
 package org.apache.airavata.credential.task;
 
+import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.compute.util.AgentAdaptor;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.status.ProcessState;
-import org.apache.airavata.common.server.CountMonitor;
 import org.apache.helix.task.TaskResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/util/TestSSLClient.java b/airavata-api/src/main/java/org/apache/airavata/credential/util/TestSSLClient.java
index f38501b1af..6351908e84 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/util/TestSSLClient.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/util/TestSSLClient.java
@@ -28,8 +28,8 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.model.credential.store.CertificateCredential;
 import org.apache.airavata.model.credential.store.CommunityUser;
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/util/Utility.java b/airavata-api/src/main/java/org/apache/airavata/credential/util/Utility.java
index f3d8961eca..6943dae5f3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/util/Utility.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/util/Utility.java
@@ -80,8 +80,8 @@ public class Utility {
         return new char[0];
     }
 
-    public static org.apache.airavata.credential.model.SSHCredential generateKeyPair(
-            SSHCredential credential) throws Exception {
+    public static org.apache.airavata.credential.model.SSHCredential generateKeyPair(SSHCredential credential)
+            throws Exception {
         JSch jsch = new JSch();
         try {
             KeyPair kpair = KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048);
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/CredentialStoreNotifier.java b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/CredentialStoreNotifier.java
index 56f56f7168..3d891b0fe8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/CredentialStoreNotifier.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/CredentialStoreNotifier.java
@@ -18,25 +18,25 @@
 * under the License.
 */
 package org.apache.airavata.credential.util.notifier; /*
-                                                        *
-                                                        * Licensed to the Apache Software Foundation (ASF) under one
-                                                        * or more contributor license agreements.  See the NOTICE file
-                                                        * distributed with this work for additional information
-                                                        * regarding copyright ownership.  The ASF licenses this file
-                                                        * to you under the Apache License, Version 2.0 (the
-                                                        * "License"); you may not use this file except in compliance
-                                                        * with the License.  You may obtain a copy of the License at
-                                                        *
-                                                        *   http://www.apache.org/licenses/LICENSE-2.0
-                                                        *
-                                                        * Unless required by applicable law or agreed to in writing,
-                                                        * software distributed under the License is distributed on an
-                                                        * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-                                                        * KIND, either express or implied.  See the License for the
-                                                        * specific language governing permissions and limitations
-                                                        * under the License.
-                                                        *
-                                                        */
+                                                       *
+                                                       * Licensed to the Apache Software Foundation (ASF) under one
+                                                       * or more contributor license agreements.  See the NOTICE file
+                                                       * distributed with this work for additional information
+                                                       * regarding copyright ownership.  The ASF licenses this file
+                                                       * to you under the Apache License, Version 2.0 (the
+                                                       * "License"); you may not use this file except in compliance
+                                                       * with the License.  You may obtain a copy of the License at
+                                                       *
+                                                       *   http://www.apache.org/licenses/LICENSE-2.0
+                                                       *
+                                                       * Unless required by applicable law or agreed to in writing,
+                                                       * software distributed under the License is distributed on an
+                                                       * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+                                                       * KIND, either express or implied.  See the License for the
+                                                       * specific language governing permissions and limitations
+                                                       * under the License.
+                                                       *
+                                                       */
 
 import org.apache.airavata.credential.repository.CredentialStoreException;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/NotifierBootstrap.java b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/NotifierBootstrap.java
index 00308a2e6f..c9d587bc24 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/NotifierBootstrap.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/NotifierBootstrap.java
@@ -26,18 +26,18 @@ package org.apache.airavata.credential.util.notifier;
  */
 import java.text.ParseException;
 import java.util.*;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.db.DBUtil;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.credential.model.CertificateCredential;
 import org.apache.airavata.credential.model.CommunityUser;
 import org.apache.airavata.credential.model.Credential;
-import org.apache.airavata.credential.model.CertificateCredential;
-import org.apache.airavata.credential.util.notifier.impl.EmailNotificationMessage;
-import org.apache.airavata.credential.util.notifier.impl.EmailNotifier;
-import org.apache.airavata.credential.util.notifier.impl.EmailNotifierConfiguration;
 import org.apache.airavata.credential.repository.CredentialReader;
-import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.airavata.credential.repository.CredentialReaderImpl;
+import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.airavata.credential.util.Utility;
+import org.apache.airavata.credential.util.notifier.impl.EmailNotificationMessage;
+import org.apache.airavata.credential.util.notifier.impl.EmailNotifier;
+import org.apache.airavata.credential.util.notifier.impl.EmailNotifierConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/impl/EmailNotifier.java b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/impl/EmailNotifier.java
index abb4cdcb4a..3638d72b62 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/impl/EmailNotifier.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/util/notifier/impl/EmailNotifier.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.credential.util.notifier.impl;
 
+import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.airavata.credential.util.notifier.CredentialStoreNotifier;
 import org.apache.airavata.credential.util.notifier.NotificationMessage;
-import org.apache.airavata.credential.repository.CredentialStoreException;
 import org.apache.commons.mail.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServerHandler.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServerHandler.java
index 1457524ad8..bb6b7cb831 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServerHandler.java
@@ -17,11 +17,18 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.service.handler;
+package org.apache.airavata.execution.handler;
 
 import java.util.*;
-import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.compute.repository.*;
+import org.apache.airavata.execution.model.JobPK;
+import org.apache.airavata.execution.repository.*;
+import org.apache.airavata.execution.repository.WorkflowRepository;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.cpi.*;
+import org.apache.airavata.execution.util.cpi.Constants;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -65,16 +72,9 @@ import org.apache.airavata.model.workspace.Project;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.airavata.registry.api.registry_apiConstants;
-import org.apache.airavata.registry.core.entities.expcatalog.JobPK;
-import org.apache.airavata.compute.repository.*;
-import org.apache.airavata.registry.core.repositories.expcatalog.*;
 import org.apache.airavata.storage.repository.DataProductRepository;
 import org.apache.airavata.storage.repository.DataReplicaLocationRepository;
 import org.apache.airavata.storage.repository.StorageResourceRepository;
-import org.apache.airavata.registry.core.repositories.workflowcatalog.WorkflowRepository;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.cpi.*;
-import org.apache.airavata.registry.cpi.utils.Constants;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventHandler.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventHandler.java
index d69c3bc2c7..f9d84442c2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventHandler.java
@@ -17,19 +17,19 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.service.messaging;
+package org.apache.airavata.execution.handler;
 
 import java.time.Duration;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.messaging.util.DBEventService;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
 import org.apache.airavata.messaging.util.DBEventPublisherUtils;
+import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.model.dbevent.CrudType;
 import org.apache.airavata.model.dbevent.DBEventMessage;
 import org.apache.airavata.model.dbevent.DBEventPublisherContext;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventMessagingFactory.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventMessagingFactory.java
index d77a450a41..d64fe5f71b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/handler/RegistryServiceDBEventMessagingFactory.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.service.messaging;
+package org.apache.airavata.execution.handler;
 
 import java.util.List;
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.util.DBEventManagerConstants;
-import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
 import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.messaging.service.Subscriber;
+import org.apache.airavata.messaging.util.DBEventManagerConstants;
+import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.model.dbevent.DBEventMessage;
 import org.apache.airavata.model.dbevent.DBEventMessageContext;
 import org.apache.airavata.model.dbevent.DBEventSubscriber;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingEntity.java
index 19de6fcebb..8ff876e67c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingPK.java
index df51fc5b17..5e023ffebd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ComputationalResourceSchedulingPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentEntity.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentEntity.java
index 8055dde100..033b637b1f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorEntity.java
index 8b1c7e31d7..49a52689f9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorPK.java
index e02c7a6212..3e0f66b80d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputEntity.java
index fc81e340ca..8ee4a3fa70 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputPK.java
index d654daf744..346d40b64e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentInputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputEntity.java
index 63cb6ffffb..bfe84fcff3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputPK.java
index 9c5b494b7f..3fb6d14f9b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentOutputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusEntity.java
index b816969022..0cae6ab464 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusPK.java
index 3b877bed6e..9ebb521ea6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentSummaryEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentSummaryEntity.java
index 709a45c525..a0822dd374 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ExperimentSummaryEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayEntity.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayEntity.java
index 9a111b2ec8..bf24b88004 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingCommandEntity.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingCommandEntity.java
index 849ccf9efa..6fb3b2aff3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingCommandEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingPK.java
index b40f59cbe4..c4cbe91ea5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayUsageReportingPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerEntity.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerEntity.java
index 2c7e76e2c9..7d81687aa9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerPK.java
index 55a222a00e..99a2d9d322 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/GatewayWorkerPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/JobEntity.java
index d56b9679b0..7668d06b5d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/JobPK.java
index cf6c9328b6..872af5000a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusEntity.java
index 7218ca3e11..2f65782c7b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusPK.java
index cb8fa04a0e..8834db60fd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/JobStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/NotificationEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/NotificationEntity.java
index 73ea351434..3162512541 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/NotificationEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessEntity.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessEntity.java
index 2ec14bb6c0..c2951c06fa 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorEntity.java
index 396c00a5ba..eec79f6a7c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorPK.java
index f3e34cec9d..62fdfb9f4e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputEntity.java
index 3c97e646a0..0b686fbdb1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputPK.java
index acb74e01d9..e9aecebaa0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessInputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputEntity.java
index 66b297d12e..f81d3d76f1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputPK.java
index 6bf7777108..02a1d5cc21 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessOutputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessResourceScheduleEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessResourceScheduleEntity.java
index dfe81e92d3..ae7120b6f6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessResourceScheduleEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusEntity.java
index 637ea193e0..aaf7e074f9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusPK.java
index cd0d2571de..ece90cdbfc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowEntity.java
index 6b64f59553..01e4c5d70b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.sql.Timestamp;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowPK.java
index db0906c096..65c091738b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProcessWorkflowPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectEntity.java
index a3f0147ee5..5a1a4ce585 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserEntity.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserEntity.java
index c3ed741e87..3128ee65c1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserPK.java
index 6af6bb98eb..87e1268b76 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/ProjectUserPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusEntity.java
index 37da6c62bb..7208086ea6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusPK.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusPK.java
index 002a8a1784..4def231c2d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/QueueStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 import java.math.BigInteger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/TaskEntity.java
index ed628ddd52..c557c2a235 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorEntity.java
index 8cbc1229a0..2eed78c7a2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorPK.java
index af10ca6b76..5953107f0a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusEntity.java
index 828c65320d..14852a6e42 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusPK.java
index 8753cf2a5d..f1a56f544b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/TaskStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserConfigurationDataEntity.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/UserConfigurationDataEntity.java
index e1e3f8ca24..2584311535 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserConfigurationDataEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/UserEntity.java
index ce4c4508af..c3d06cd67c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import jakarta.persistence.*;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/UserPK.java
index 88db292aed..baf6ea6e1c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/UserPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.expcatalog;
+package org.apache.airavata.execution.model;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowEntity.java
index bca0157a65..80fdacd102 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorEntity.java
index 22155feac1..ede141ee8e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorPK.java
index 1379a57070..d155494587 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusEntity.java
index 1e4a8baebd..0e7424dba2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusPK.java
index 02a788242f..e98f243a26 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/AiravataWorkflowStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorEntity.java
index 363338980a..9bacf3d8fd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorPK.java
index 668f20a3f0..11be33dff1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusEntity.java
index 48fdaadd6e..78283386ed 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusPK.java
index 34df5de9b1..107158170c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ApplicationStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ComponentStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ComponentStatusEntity.java
index aaad27e5c5..04841783c7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/ComponentStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgeEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgeEntity.java
index 27683e5baa..f1d71925ad 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgeEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgePK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgePK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgePK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgePK.java
index 0a2d16757d..ebaa7a45f3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgePK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/EdgePK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorEntity.java
index 88426b2de4..07f0132149 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorPK.java
index c57b2088da..0341a0e62a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerErrorPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputEntity.java
index 46da7765fa..0e37e44e39 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputPK.java
index 06f1ab2297..b56eb7c116 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerInputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputEntity.java
index 9348aa22ab..c24315c4e4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputPK.java
index 0815337379..2632698b5b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerOutputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusEntity.java
index 9dde917cd9..65363acc46 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusPK.java
index f0f081bd73..e81e5a68c9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/HandlerStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodeEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodeEntity.java
index 23874a7c17..495614fcc0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodeEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodePK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodePK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodePK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodePK.java
index e321a9e2ca..a3e958a5a6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodePK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/NodePK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortEntity.java
index b90e55f285..336be26686 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortPK.java
index a84d045976..3ff060a99f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/PortPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationEntity.java
index 761bcdd30b..371e8edad5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationPK.java
index 626bbf7e43..6404383123 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowApplicationPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionEntity.java
index 0e4c9d7c6a..1712e92062 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionPK.java
index b524104ecf..2d2ed5199a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowConnectionPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowDataBlockEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowDataBlockEntity.java
index 067f267dfd..b1d34b9656 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowDataBlockEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowEntity.java
index d925b66b4d..ac64709465 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerEntity.java
index 4bcc5c11b9..20e57ce3fb 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerPK.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerPK.java
index 99f973bcdc..6e67607ffe 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowHandlerPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputEntity.java
index 7c3fd1a0ef..60d5bc9b76 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputPK.java
index 5b13f9e49b..915c3d9491 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowInputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputEntity.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputEntity.java
index 9fb9d0ae8f..0c81aaa10b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputPK.java
index 3f6210056d..5e31799e9b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowOutputPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusEntity.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusEntity.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusEntity.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusEntity.java
index 75c90f4fb5..bc837c508b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusEntity.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusPK.java b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusPK.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusPK.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusPK.java
index a48ec9af49..0abc86a4e5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowStatusPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/model/workflow/WorkflowStatusPK.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.entities.workflowcatalog;
+package org.apache.airavata.execution.model.workflow;
 
 import java.io.Serializable;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/AbstractMonitor.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/AbstractMonitor.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/AbstractMonitor.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/AbstractMonitor.java
index 54048bd381..001038ae9c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/AbstractMonitor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/AbstractMonitor.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor;
+package org.apache.airavata.execution.monitor;
 
 /**
  * Functional contract for job monitors. Implementations receive job status results
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/AiravataCustomMailParser.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/AiravataCustomMailParser.java
index 8a541b2fd4..8a2adceb97 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/AiravataCustomMailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJob.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJob.java
index 60d70c2884..3eaa9631b8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJob.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.cluster.monitoring;
+package org.apache.airavata.execution.monitor;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelExec;
@@ -26,8 +26,8 @@ import com.jcraft.jsch.Session;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
diff --git a/airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJobScheduler.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJobScheduler.java
index 7dcc572e12..1306f50384 100644
--- a/airavata-api/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ClusterStatusMonitorJobScheduler.java
@@ -17,14 +17,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.cluster.monitoring;
+package org.apache.airavata.execution.monitor;
 
 import static org.quartz.JobBuilder.newJob;
 import static org.quartz.SimpleScheduleBuilder.*;
 import static org.quartz.TriggerBuilder.*;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.quartz.*;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputationalResourceMonitoringService.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputationalResourceMonitoringService.java
index 0bdbf4a5fc..eb29da0895 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputationalResourceMonitoringService.java
@@ -17,15 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring;
+package org.apache.airavata.execution.monitor;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.airavata.common.server.IServer;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.compute.resource.monitoring.job.MonitoringJob;
-import org.apache.airavata.compute.resource.monitoring.utils.Constants;
+import org.apache.airavata.common.server.IServer;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputeResourceMonitor.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputeResourceMonitor.java
index dcaed3bb29..4ad5f1096b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ComputeResourceMonitor.java
@@ -17,10 +17,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring.job;
+package org.apache.airavata.execution.monitor;
 
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.utils.Utils;
+import org.apache.airavata.execution.scheduler.Utils;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/Constants.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/utils/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/Constants.java
index 089c4d74b0..4f2b52acd7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/utils/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/Constants.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring.utils;
+package org.apache.airavata.execution.monitor;
 
 public class Constants {
     public static final String METASCHEDULER_GATEWAY = "metascheduler.gateway";
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailBasedMonitor.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailBasedMonitor.java
index 25631fbef2..02a8cbf869 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailBasedMonitor.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Address;
 import jakarta.mail.Flags;
@@ -31,20 +31,14 @@ import jakarta.mail.search.SearchTerm;
 import java.io.InputStream;
 import java.time.Duration;
 import java.util.*;
+import org.apache.airavata.common.config.ApplicationSettings;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.config.ApplicationSettings;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
 import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.monitor.AbstractMonitor;
-import org.apache.airavata.monitor.JobStatusResult;
-import org.apache.airavata.monitor.MonitoringException;
-import org.apache.airavata.monitor.email.parser.EmailParser;
-import org.apache.airavata.monitor.email.parser.ResourceConfig;
-import org.apache.airavata.monitor.kafka.MessageProducer;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailParser.java
similarity index 92%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailParser.java
index 6aa7da7ab3..a09c2b51a8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/EmailParser.java
@@ -17,12 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 
 public interface EmailParser {
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/HTCondorEmailParser.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/HTCondorEmailParser.java
index 7b0918322d..5c2fcea929 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/HTCondorEmailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -28,7 +28,6 @@ import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStateValidator.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStateValidator.java
index cc5302de59..f45ebe9beb 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStateValidator.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor;
+package org.apache.airavata.execution.monitor;
 
 import static org.apache.airavata.model.status.JobState.ACTIVE;
 import static org.apache.airavata.model.status.JobState.CANCELED;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/JobStatusResult.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResult.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/JobStatusResult.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResult.java
index 712bae8a1e..ba943b76b1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/JobStatusResult.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResult.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor;
+package org.apache.airavata.execution.monitor;
 
 import org.apache.airavata.model.status.JobState;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultDeserializer.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultDeserializer.java
index 4ad03112e2..951dd6c737 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultDeserializer.java
@@ -17,11 +17,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.kafka;
+package org.apache.airavata.execution.monitor;
 
 import java.util.Map;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.kafka.common.serialization.Deserializer;
 
 public class JobStatusResultDeserializer implements Deserializer<JobStatusResult> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultSerializer.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultSerializer.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultSerializer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultSerializer.java
index 7ebfaf5bfa..f6633652f0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultSerializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/JobStatusResultSerializer.java
@@ -17,10 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.kafka;
+package org.apache.airavata.execution.monitor;
 
 import java.util.Map;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.kafka.common.serialization.Serializer;
 
 public class JobStatusResultSerializer implements Serializer<JobStatusResult> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/LSFEmailParser.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/LSFEmailParser.java
index e979a7eaf3..e0466b4562 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/LSFEmailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -26,7 +26,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/MessageProducer.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MessageProducer.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/kafka/MessageProducer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/MessageProducer.java
index 79c0598fd4..1be9e38de5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/kafka/MessageProducer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MessageProducer.java
@@ -17,13 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.kafka;
+package org.apache.airavata.execution.monitor;
 
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.monitor.JobStatusResult;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.kafka.clients.producer.*;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/MonitoringException.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/MonitoringException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringException.java
index 0599081983..207f7f4d12 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/MonitoringException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor;
+package org.apache.airavata.execution.monitor;
 
 public class MonitoringException extends Exception {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringJob.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringJob.java
index 5ee879f816..c263b35bdc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/MonitoringJob.java
@@ -17,20 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring.job;
+package org.apache.airavata.execution.monitor;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import org.apache.airavata.compute.task.JobFactory;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.CommandOutput;
-import org.apache.airavata.compute.resource.monitoring.job.output.OutputParser;
-import org.apache.airavata.compute.resource.monitoring.job.output.OutputParserImpl;
-import org.apache.airavata.compute.resource.monitoring.utils.Constants;
-import org.apache.airavata.helix.core.support.adaptor.AdaptorSupportImpl;
-import org.apache.airavata.compute.task.JobFactory;
-import org.apache.airavata.helix.task.api.support.AdaptorSupport;
+import org.apache.airavata.execution.orchestrator.AdaptorSupport;
+import org.apache.airavata.execution.orchestrator.AdaptorSupportImpl;
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParser.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParser.java
index 9ddde8d1d0..43a08cab86 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring.job.output;
+package org.apache.airavata.execution.monitor;
 
 import org.apache.airavata.compute.util.CommandOutput;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParserImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParserImpl.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParserImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParserImpl.java
index 220673bf68..9d6e330166 100644
--- a/airavata-api/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParserImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/OutputParserImpl.java
@@ -17,11 +17,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.compute.resource.monitoring.job.output;
+package org.apache.airavata.execution.monitor;
 
 import java.util.Scanner;
 import org.apache.airavata.compute.util.CommandOutput;
-import org.apache.airavata.compute.resource.monitoring.utils.Constants;
 
 /**
  * This is parser output implementation
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/PBSEmailParser.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/PBSEmailParser.java
index 9cf1abbbe3..bc092e397a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/PBSEmailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/realtime/parser/RealtimeJobStatusParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeJobStatusParser.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/realtime/parser/RealtimeJobStatusParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeJobStatusParser.java
index 4a109f065c..6e81925f1d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/realtime/parser/RealtimeJobStatusParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeJobStatusParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.realtime.parser;
+package org.apache.airavata.execution.monitor;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Optional;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/realtime/RealtimeMonitor.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeMonitor.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/realtime/RealtimeMonitor.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeMonitor.java
index cff8e98bb0..d83b12db92 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/realtime/RealtimeMonitor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/RealtimeMonitor.java
@@ -17,22 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.realtime;
+package org.apache.airavata.execution.monitor;
 
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
 import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.monitor.AbstractMonitor;
-import org.apache.airavata.monitor.JobStatusResult;
-import org.apache.airavata.monitor.MonitoringException;
-import org.apache.airavata.monitor.kafka.MessageProducer;
-import org.apache.airavata.monitor.realtime.parser.RealtimeJobStatusParser;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.kafka.clients.consumer.Consumer;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/ResourceConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ResourceConfig.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/ResourceConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/ResourceConfig.java
index f58ba34deb..2145597c75 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/ResourceConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/ResourceConfig.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import java.util.List;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/SLURMEmailParser.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/SLURMEmailParser.java
index 10f33b3438..fcdf8773d5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/SLURMEmailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/UGEEmailParser.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/monitor/UGEEmailParser.java
index f6c0ebac88..bb0801cb4b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/monitor/UGEEmailParser.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.monitor.email.parser;
+package org.apache.airavata.execution.monitor;
 
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -26,7 +26,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.monitor.JobStatusResult;
 import org.apache.airavata.registry.api.RegistryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AWSTaskFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AWSTaskFactory.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AWSTaskFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AWSTaskFactory.java
index 1c37279656..6d5ad8ca2d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AWSTaskFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AWSTaskFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.compute.task.aws.AWSCompletingTask;
 import org.apache.airavata.compute.task.aws.AWSJobSubmissionTask;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractOrchestrator.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractOrchestrator.java
index 62861cf7df..9bbb96db40 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractOrchestrator.java
@@ -17,16 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.cpi.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.IOException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.orchestrator.core.OrchestratorConfiguration;
-import org.apache.airavata.orchestrator.core.context.OrchestratorContext;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
-import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
-import org.apache.airavata.orchestrator.cpi.Orchestrator;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractTask.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractTask.java
index efcf11a847..de3b6aeb7f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AbstractTask.java
@@ -17,16 +17,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core;
+package org.apache.airavata.execution.orchestrator;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.participant.HelixParticipant;
-import org.apache.airavata.helix.core.util.MonitoringUtil;
-import org.apache.airavata.helix.core.util.TaskUtil;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskOutPort;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.common.server.GaugeMonitor;
 import org.apache.curator.RetryPolicy;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupport.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupport.java
index 1dc90fbeee..c7778356b7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupport.java
@@ -17,13 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api.support;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.AgentException;
-import org.apache.airavata.storage.util.StorageResourceAdaptor;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
 import org.apache.airavata.model.data.movement.DataMovementProtocol;
+import org.apache.airavata.storage.util.StorageResourceAdaptor;
 
 /**
  * TODO: Class level comments please
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupportImpl.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupportImpl.java
index 97cd9542f1..12a9dae22f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AdaptorSupportImpl.java
@@ -17,17 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.support.adaptor;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.Optional;
 import org.apache.airavata.compute.util.AgentAdaptor;
 import org.apache.airavata.compute.util.AgentException;
-import org.apache.airavata.storage.util.StorageResourceAdaptor;
 import org.apache.airavata.compute.util.SSHJAgentAdaptor;
-import org.apache.airavata.storage.util.SSHJStorageAdaptor;
-import org.apache.airavata.helix.task.api.support.AdaptorSupport;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
 import org.apache.airavata.model.data.movement.DataMovementProtocol;
+import org.apache.airavata.storage.util.SSHJStorageAdaptor;
+import org.apache.airavata.storage.util.StorageResourceAdaptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AgentStore.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AgentStore.java
index 50cdcc2e70..2f47a57e4d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AgentStore.java
@@ -17,15 +17,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.support.adaptor;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import org.apache.airavata.compute.util.AgentAdaptor;
-import org.apache.airavata.storage.util.StorageResourceAdaptor;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
 import org.apache.airavata.model.data.movement.DataMovementProtocol;
+import org.apache.airavata.storage.util.StorageResourceAdaptor;
 
 /**
  * TODO: Class level comments please
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AiravataTask.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AiravataTask.java
index 4f0a7f486a..6b63835e35 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/AiravataTask.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,19 +26,16 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.util.MonitoringUtil;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
 import org.apache.airavata.messaging.service.Publisher;
-import org.apache.airavata.messaging.service.Type;
 import org.apache.airavata.messaging.service.RabbitMQPublisher;
+import org.apache.airavata.messaging.service.Type;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.commons.ErrorModel;
@@ -48,7 +45,6 @@ import org.apache.airavata.model.messaging.event.*;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.*;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.airavata.security.profile.client.ProfileServiceClientFactory;
 import org.apache.airavata.service.profile.user.cpi.UserProfileService;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/BatchQueueValidator.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/BatchQueueValidator.java
index bbfdbb5350..1534b33fee 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/BatchQueueValidator.java
@@ -17,12 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.validator.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.error.ValidationResults;
@@ -30,9 +31,7 @@ import org.apache.airavata.model.error.ValidatorResult;
 import org.apache.airavata.model.experiment.*;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
-import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Constants.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Constants.java
index 5664bccf1b..c2a2f92e37 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Constants.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.util;
+package org.apache.airavata.execution.orchestrator;
 
 public class Constants {
     public static final String ORCHESTRATOT_SERVER_PORT = "orchestrator.server.port";
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/DefaultHostScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/DefaultHostScheduler.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/DefaultHostScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/DefaultHostScheduler.java
index 12da761e71..4c79be8ea3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/DefaultHostScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/DefaultHostScheduler.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.schedule;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.List;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ExperimentStatusValidator.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ExperimentStatusValidator.java
index 0cb12c417d..4749cd35b0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ExperimentStatusValidator.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.validator.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +26,6 @@ import org.apache.airavata.model.error.ValidatorResult;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.ExperimentState;
-import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GFACPassiveJobSubmitter.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GFACPassiveJobSubmitter.java
index 6608995ee1..1da3be2c08 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GFACPassiveJobSubmitter.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.UUID;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.credential.repository.CredentialReader;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
@@ -31,10 +31,6 @@ import org.apache.airavata.messaging.service.Type;
 import org.apache.airavata.model.messaging.event.MessageType;
 import org.apache.airavata.model.messaging.event.ProcessSubmitEvent;
 import org.apache.airavata.model.messaging.event.ProcessTerminateEvent;
-import org.apache.airavata.orchestrator.core.context.OrchestratorContext;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
-import org.apache.airavata.orchestrator.core.job.JobSubmitter;
-import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GlobalParticipant.java
similarity index 84%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GlobalParticipant.java
index 2c9da3e506..59871fa4ed 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GlobalParticipant.java
@@ -17,15 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.participant;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.participant.HelixParticipant;
 import org.apache.airavata.common.server.MonitoringServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,18 +38,18 @@ public class GlobalParticipant extends HelixParticipant<AbstractTask> implements
         "org.apache.airavata.credential.task.EnvSetupTask",
         "org.apache.airavata.storage.task.InputDataStagingTask",
         "org.apache.airavata.storage.task.OutputDataStagingTask",
-        "org.apache.airavata.helix.impl.task.staging.JobVerificationTask",
-        "org.apache.airavata.helix.impl.task.completing.CompletingTask",
+        "org.apache.airavata.execution.task.JobVerificationTask",
+        "org.apache.airavata.execution.task.CompletingTask",
         "org.apache.airavata.compute.task.ForkJobSubmissionTask",
         "org.apache.airavata.compute.task.DefaultJobSubmissionTask",
         "org.apache.airavata.compute.task.LocalJobSubmissionTask",
         "org.apache.airavata.storage.task.ArchiveTask",
-        "org.apache.airavata.helix.impl.task.cancel.WorkflowCancellationTask",
-        "org.apache.airavata.helix.impl.task.cancel.RemoteJobCancellationTask",
-        "org.apache.airavata.helix.impl.task.cancel.CancelCompletingTask",
-        "org.apache.airavata.helix.impl.task.parsing.DataParsingTask",
-        "org.apache.airavata.helix.impl.task.parsing.ParsingTriggeringTask",
-        "org.apache.airavata.helix.impl.task.mock.MockTask",
+        "org.apache.airavata.execution.task.WorkflowCancellationTask",
+        "org.apache.airavata.execution.task.RemoteJobCancellationTask",
+        "org.apache.airavata.execution.task.CancelCompletingTask",
+        "org.apache.airavata.execution.task.DataParsingTask",
+        "org.apache.airavata.execution.task.ParsingTriggeringTask",
+        "org.apache.airavata.execution.task.MockTask",
         "org.apache.airavata.compute.task.aws.CreateEC2InstanceTask",
         "org.apache.airavata.compute.task.aws.NoOperationTask",
         "org.apache.airavata.compute.task.aws.AWSJobSubmissionTask",
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/GroupResourceProfileValidator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GroupResourceProfileValidator.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/GroupResourceProfileValidator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GroupResourceProfileValidator.java
index 7ba1688fe5..3bd43e258d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/GroupResourceProfileValidator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/GroupResourceProfileValidator.java
@@ -17,12 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.validator.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResourcePolicy;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
 import org.apache.airavata.model.error.ValidationResults;
@@ -31,9 +32,7 @@ import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.UserConfigurationDataModel;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
-import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixController.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixController.java
index 5d546e3343..d68565751d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixController.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.controller;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.concurrent.CountDownLatch;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.helix.controller.HelixControllerMain;
 import org.apache.helix.manager.zk.ZKHelixAdmin;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixParticipant.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixParticipant.java
index 7141854d7f..bf65cd723b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixParticipant.java
@@ -17,14 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.participant;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.*;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.support.TaskHelperImpl;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.helix.InstanceType;
 import org.apache.helix.examples.OnlineOfflineStateModelFactory;
 import org.apache.helix.manager.zk.ZKHelixAdmin;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/HelixTaskFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixTaskFactory.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/HelixTaskFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixTaskFactory.java
index e8c28999c0..09a71eef34 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/HelixTaskFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HelixTaskFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 public interface HelixTaskFactory {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HostScheduler.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HostScheduler.java
index 1a1b4e8f4d..71b651f750 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/HostScheduler.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.schedule;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.List;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobMetadataValidator.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobMetadataValidator.java
index 204588510b..723b131450 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobMetadataValidator.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.validator;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.model.error.ValidationResults;
 import org.apache.airavata.model.experiment.ExperimentModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobSubmitter.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobSubmitter.java
index 7d6d03a3fe..7d8e27bf44 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/JobSubmitter.java
@@ -17,10 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.job;
-
-import org.apache.airavata.orchestrator.core.context.OrchestratorContext;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
+package org.apache.airavata.execution.orchestrator;
 
 /**
  * This is the submitter interface, orchestrator can
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/MonitoringUtil.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/MonitoringUtil.java
index e1813b30cd..0eaf8aef22 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/MonitoringUtil.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.util;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Orchestrator.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Orchestrator.java
index d01fbdb0a3..1d3bb5e876 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/Orchestrator.java
@@ -17,13 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.cpi;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.model.error.LaunchValidationException;
 import org.apache.airavata.model.error.ValidationResults;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
 
 /*
    This is the interface for orchestrator functionality exposed to the out side of the
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientFactory.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientFactory.java
index 34d1cd285b..0a073da432 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.client;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.orchestrator.cpi.OrchestratorService;
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientSample.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientSample.java
index 4231f7ebdd..9579ff3789 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorClientSample.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.sample;
+package org.apache.airavata.execution.orchestrator;
 
 // import org.apache.airavata.client.AiravataAPIFactory;
 // import org.apache.airavata.client.api.AiravataAPI;
@@ -26,13 +26,13 @@ package org.apache.airavata.orchestrator.sample;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.airavata.execution.util.ExperimentModelUtil;
 import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.UserConfigurationDataModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
-import org.apache.airavata.model.util.ExperimentModelUtil;
 import org.apache.airavata.orchestrator.cpi.OrchestratorService;
 import org.apache.thrift.TException;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConfiguration.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConfiguration.java
index 750576266f..342d23df09 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConfiguration.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.List;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConstants.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConstants.java
index 8bbd0d9066..92bd432ffc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorConstants.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.utils;
+package org.apache.airavata.execution.orchestrator;
 
 /**
  * This class contains all the constants in orchestrator-core
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorContext.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorContext.java
index a19e690a52..980083452f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorContext.java
@@ -17,10 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.context;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.airavata.messaging.service.Publisher;
-import org.apache.airavata.orchestrator.core.OrchestratorConfiguration;
 
 /**
  * This is the context object used in orchestrator which
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/exception/OrchestratorException.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/exception/OrchestratorException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorException.java
index f50cf891fd..27c8d95b68 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/exception/OrchestratorException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.exception;
+package org.apache.airavata.execution.orchestrator;
 
 /**
  * This is the main exception class for orchestrator, All the other
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerThreadPoolExecutor.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerThreadPoolExecutor.java
index 6bf95bd534..7ac1494f90 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerThreadPoolExecutor.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.util;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerUtils.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerUtils.java
index 65db439651..7464f5220b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorServerUtils.java
@@ -17,13 +17,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.util;
+package org.apache.airavata.execution.orchestrator;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftUtils;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
@@ -31,13 +32,12 @@ import org.apache.airavata.model.messaging.event.MessageType;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.ExperimentStatus;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OrchestratorUtils {
+public class OrchestratorServerUtils {
     private static final Logger log = LoggerFactory.getLogger(OrchestratorUtils.class);
 
     public static void updateAndPublishExperimentStatus(
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorUtils.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorUtils.java
index 5525e76a48..9d684dc8d9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OrchestratorUtils.java
@@ -17,20 +17,21 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.core.utils;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.DBUtil;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.DBUtil;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.credential.repository.CredentialReader;
 import org.apache.airavata.credential.repository.CredentialReaderImpl;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
@@ -48,10 +49,7 @@ import org.apache.airavata.model.data.movement.SCPDataMovement;
 import org.apache.airavata.model.data.movement.SecurityProtocol;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
-import org.apache.airavata.orchestrator.core.OrchestratorConfiguration;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/OutPort.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OutPort.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/OutPort.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OutPort.java
index 4c793e6d79..912781ddfd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/OutPort.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/OutPort.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core;
+package org.apache.airavata.execution.orchestrator;
 
 import org.apache.helix.task.TaskResult;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ParserWorkflowManager.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ParserWorkflowManager.java
index 745bc6d041..54d160866f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/ParserWorkflowManager.java
@@ -17,28 +17,26 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.*;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.impl.task.parsing.*;
-import org.apache.airavata.helix.impl.task.parsing.ProcessCompletionMessage;
-import org.apache.airavata.helix.impl.task.parsing.kafka.ProcessCompletionMessageDeserializer;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInput;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInputs;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskOutput;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskOutputs;
+import org.apache.airavata.common.server.MonitoringServer;
+import org.apache.airavata.execution.task.*;
+import org.apache.airavata.execution.task.ParsingTaskInput;
+import org.apache.airavata.execution.task.ParsingTaskInputs;
+import org.apache.airavata.execution.task.ParsingTaskOutput;
+import org.apache.airavata.execution.task.ParsingTaskOutputs;
+import org.apache.airavata.execution.task.ProcessCompletionMessage;
+import org.apache.airavata.execution.task.ProcessCompletionMessageDeserializer;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.parser.*;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.common.server.CountMonitor;
-import org.apache.airavata.common.server.MonitoringServer;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.kafka.clients.consumer.*;
 import org.apache.kafka.common.TopicPartition;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PostWorkflowManager.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PostWorkflowManager.java
index 95bd5681b5..aa208bcdd2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PostWorkflowManager.java
@@ -17,19 +17,20 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.*;
 import java.util.concurrent.*;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.server.MonitoringServer;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.HelixTaskFactory;
-import org.apache.airavata.helix.impl.task.TaskFactory;
+import org.apache.airavata.execution.monitor.JobStateValidator;
+import org.apache.airavata.execution.monitor.JobStatusResult;
+import org.apache.airavata.execution.monitor.JobStatusResultDeserializer;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType;
 import org.apache.airavata.model.experiment.ExperimentModel;
@@ -45,11 +46,6 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.task.DataStagingTaskModel;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.task.TaskTypes;
-import org.apache.airavata.monitor.JobStateValidator;
-import org.apache.airavata.monitor.JobStatusResult;
-import org.apache.airavata.monitor.kafka.JobStatusResultDeserializer;
-import org.apache.airavata.common.server.CountMonitor;
-import org.apache.airavata.common.server.MonitoringServer;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.kafka.clients.consumer.*;
 import org.apache.kafka.common.serialization.StringDeserializer;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PreWorkflowManager.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PreWorkflowManager.java
index d87a697c5b..73a31e9ffb 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PreWorkflowManager.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -25,20 +25,17 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.server.MonitoringServer;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.HelixTaskFactory;
-import org.apache.airavata.helix.impl.task.TaskFactory;
-import org.apache.airavata.helix.impl.task.cancel.CancelCompletingTask;
-import org.apache.airavata.helix.impl.task.cancel.RemoteJobCancellationTask;
-import org.apache.airavata.helix.impl.task.cancel.WorkflowCancellationTask;
-import org.apache.airavata.helix.impl.task.completing.CompletingTask;
+import org.apache.airavata.execution.task.CancelCompletingTask;
+import org.apache.airavata.execution.task.CompletingTask;
+import org.apache.airavata.execution.task.RemoteJobCancellationTask;
+import org.apache.airavata.execution.task.WorkflowCancellationTask;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
 import org.apache.airavata.messaging.service.MessagingFactory;
@@ -56,8 +53,6 @@ import org.apache.airavata.model.status.ProcessState;
 import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.task.TaskTypes;
-import org.apache.airavata.common.server.CountMonitor;
-import org.apache.airavata.common.server.MonitoringServer;
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/PropertyResolver.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PropertyResolver.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/util/PropertyResolver.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PropertyResolver.java
index ede8870802..77e9755c08 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/PropertyResolver.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/PropertyResolver.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.util;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/workflow/QueueOperator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/QueueOperator.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/workflow/QueueOperator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/QueueOperator.java
index eae5193797..cd20b09be4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/workflow/QueueOperator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/QueueOperator.java
@@ -17,13 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
@@ -164,7 +162,7 @@ public class QueueOperator {
         TaskConfig.Builder taskBuilder =
                 new TaskConfig.Builder().setTaskId("Task_" + task.getTaskId()).setCommand(taskType);
 
-        Map<String, String> paramMap = org.apache.airavata.helix.core.util.TaskUtil.serializeTaskData(task);
+        Map<String, String> paramMap = org.apache.airavata.execution.orchestrator.TaskUtil.serializeTaskData(task);
         paramMap.forEach(taskBuilder::addConfig);
 
         List<TaskConfig> taskBuilds = new ArrayList<>();
diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SimpleOrchestratorImpl.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SimpleOrchestratorImpl.java
index 6eb5502dd0..f7e5d14b25 100644
--- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SimpleOrchestratorImpl.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.cpi.impl;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.File;
 import java.net.URI;
@@ -30,11 +30,13 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftUtils;
+import org.apache.airavata.execution.util.ExperimentModelUtil;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
@@ -63,15 +65,7 @@ import org.apache.airavata.model.task.JobSubmissionTaskModel;
 import org.apache.airavata.model.task.MonitorTaskModel;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.task.TaskTypes;
-import org.apache.airavata.model.util.ExperimentModelUtil;
-import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
-import org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter;
-import org.apache.airavata.orchestrator.core.job.JobSubmitter;
-import org.apache.airavata.orchestrator.core.utils.OrchestratorConstants;
-import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
-import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/SlurmTaskFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SlurmTaskFactory.java
similarity index 92%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/SlurmTaskFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SlurmTaskFactory.java
index 83706e9d54..e796b5b17b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/SlurmTaskFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/SlurmTaskFactory.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
-import org.apache.airavata.helix.impl.task.completing.CompletingTask;
+import org.apache.airavata.compute.task.DefaultJobSubmissionTask;
 import org.apache.airavata.credential.task.EnvSetupTask;
-import org.apache.airavata.helix.impl.task.parsing.ParsingTriggeringTask;
+import org.apache.airavata.execution.task.CompletingTask;
+import org.apache.airavata.execution.task.JobVerificationTask;
+import org.apache.airavata.execution.task.ParsingTriggeringTask;
 import org.apache.airavata.storage.task.ArchiveTask;
 import org.apache.airavata.storage.task.InputDataStagingTask;
-import org.apache.airavata.helix.impl.task.staging.JobVerificationTask;
 import org.apache.airavata.storage.task.OutputDataStagingTask;
-import org.apache.airavata.compute.task.DefaultJobSubmissionTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskContext.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskContext.java
index ec6a57e105..7d081c08f3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskContext.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,6 +31,7 @@ import java.util.Map;
 import java.util.Optional;
 import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.util.ThriftUtils;
+import org.apache.airavata.compute.util.GroupComputeResourcePreferenceUtil;
 import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -67,11 +68,10 @@ import org.apache.airavata.model.status.TaskState;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.compute.util.GroupComputeResourcePreferenceUtil;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.service.profile.user.cpi.UserProfileService;
 import org.apache.airavata.security.service.AiravataSecurityManager;
 import org.apache.airavata.security.service.SecurityManagerFactory;
+import org.apache.airavata.service.profile.user.cpi.UserProfileService;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskDef.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskDef.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskDef.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskDef.java
index ad3f86e05e..f2b6a54511 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskDef.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskDef.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api.annotation;
+package org.apache.airavata.execution.orchestrator;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskFactory.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskFactory.java
index 4b79ea4a19..30e212e8f3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.EnumMap;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskHelper.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelper.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskHelper.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelper.java
index c89636967d..885e0c34c2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskHelper.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelper.java
@@ -17,9 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api;
-
-import org.apache.airavata.helix.task.api.support.AdaptorSupport;
+package org.apache.airavata.execution.orchestrator;
 
 /**
  * TODO: Class level comments please
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/TaskHelperImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelperImpl.java
similarity index 85%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/support/TaskHelperImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelperImpl.java
index f598bbc6b1..1e7e44adab 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/support/TaskHelperImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskHelperImpl.java
@@ -17,10 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.support;
-
-import org.apache.airavata.helix.core.support.adaptor.AdaptorSupportImpl;
-import org.apache.airavata.helix.task.api.TaskHelper;
+package org.apache.airavata.execution.orchestrator;
 
 /**
  * TODO: Class level comments please
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskOnFailException.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOnFailException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskOnFailException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOnFailException.java
index ddb61fadde..03036eca10 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskOnFailException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOnFailException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task;
+package org.apache.airavata.execution.orchestrator;
 
 public class TaskOnFailException extends Exception {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskOutPort.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOutPort.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskOutPort.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOutPort.java
index c147eac78d..960d4c00c4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskOutPort.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskOutPort.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api.annotation;
+package org.apache.airavata.execution.orchestrator;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskParam.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParam.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskParam.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParam.java
index a89a31e484..1f2e2d67ad 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/annotation/TaskParam.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParam.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api.annotation;
+package org.apache.airavata.execution.orchestrator;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskParamType.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParamType.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskParamType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParamType.java
index a96d5bda6d..fdfd2bcb69 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/task/api/TaskParamType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskParamType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.task.api;
+package org.apache.airavata.execution.orchestrator;
 
 public interface TaskParamType {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskUtil.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskUtil.java
index 9d2317f75d..87fdc2c93a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/TaskUtil.java
@@ -17,17 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.core.util;
+package org.apache.airavata.execution.orchestrator;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.task.api.TaskParamType;
-import org.apache.airavata.helix.task.api.annotation.TaskOutPort;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowCleanupAgent.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowCleanupAgent.java
index 972e171ad2..46bafb484c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowCleanupAgent.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.controller;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.Map;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowManager.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowManager.java
index 276f997463..3135c4e8f8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowManager.java
@@ -17,18 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.helix.workflow.WorkflowOperator;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
 import org.apache.airavata.messaging.service.Publisher;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/workflow/WorkflowOperator.java b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowOperator.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/helix/workflow/WorkflowOperator.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowOperator.java
index 341784a627..1108765a1b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/workflow/WorkflowOperator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/orchestrator/WorkflowOperator.java
@@ -17,15 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.workflow;
+package org.apache.airavata.execution.orchestrator;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.core.util.TaskUtil;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
@@ -87,7 +83,7 @@ public class WorkflowOperator {
             TaskConfig.Builder taskBuilder = new TaskConfig.Builder()
                     .setTaskId("Task_" + data.getTaskId())
                     .setCommand(taskType);
-            Map<String, String> paramMap = org.apache.airavata.helix.core.util.TaskUtil.serializeTaskData(data);
+            Map<String, String> paramMap = org.apache.airavata.execution.orchestrator.TaskUtil.serializeTaskData(data);
             paramMap.forEach(taskBuilder::addConfig);
 
             List<TaskConfig> taskBuilds = new ArrayList<>();
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExpCatAbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExpCatAbstractRepository.java
similarity index 84%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExpCatAbstractRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExpCatAbstractRepository.java
index 52a6a313a3..b1643d97f3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExpCatAbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExpCatAbstractRepository.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import jakarta.persistence.EntityManager;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.apache.airavata.registry.core.utils.JPAUtil.ExpCatalogJPAUtils;
+import org.apache.airavata.execution.util.AbstractRepository;
+import org.apache.airavata.execution.util.ExpCatalogJPAUtils;
 
 public class ExpCatAbstractRepository<T, E, Id> extends AbstractRepository<T, E, Id> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentErrorRepository.java
similarity index 87%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentErrorRepository.java
index c0312b32ac..3b1dd894b2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentErrorRepository.java
@@ -17,17 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.List;
+import org.apache.airavata.execution.model.ExperimentErrorEntity;
+import org.apache.airavata.execution.model.ExperimentErrorPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.ErrorModel;
 import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentInputRepository.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentInputRepository.java
index 5db34cd846..3c46792c25 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentInputRepository.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.List;
+import org.apache.airavata.execution.model.ExperimentInputEntity;
+import org.apache.airavata.execution.model.ExperimentInputPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentInputEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentInputPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentOutputRepository.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentOutputRepository.java
index ceae29a034..fde0a6904c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentOutputRepository.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.List;
+import org.apache.airavata.execution.model.ExperimentOutputEntity;
+import org.apache.airavata.execution.model.ExperimentOutputPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentOutputEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentOutputPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentRepository.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentRepository.java
index fa0efcc5db..ce9b78c3d8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentRepository.java
@@ -17,24 +17,24 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.ComputationalResourceSchedulingEntity;
+import org.apache.airavata.execution.model.ExperimentEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
+import org.apache.airavata.execution.util.cpi.ResultOrderType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.UserConfigurationDataModel;
 import org.apache.airavata.model.status.ExperimentState;
 import org.apache.airavata.model.status.ExperimentStatus;
-import org.apache.airavata.registry.core.entities.expcatalog.ComputationalResourceSchedulingEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
-import org.apache.airavata.registry.cpi.ResultOrderType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentStatusRepository.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentStatusRepository.java
index 7b8c34c300..887e039c5d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentStatusRepository.java
@@ -17,20 +17,20 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.List;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.ExperimentStatusEntity;
+import org.apache.airavata.execution.model.ExperimentStatusPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.status.ExperimentState;
 import org.apache.airavata.model.status.ExperimentStatus;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentStatusEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentStatusPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentSummaryRepository.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentSummaryRepository.java
index f89ef81e9d..e7d0914a7b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ExperimentSummaryRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import jakarta.persistence.Query;
 import java.sql.Timestamp;
@@ -27,14 +27,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.apache.airavata.execution.model.ExperimentSummaryEntity;
+import org.apache.airavata.execution.model.JobEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
+import org.apache.airavata.execution.util.cpi.ResultOrderType;
 import org.apache.airavata.model.experiment.ExperimentStatistics;
 import org.apache.airavata.model.experiment.ExperimentSummaryModel;
 import org.apache.airavata.model.status.ExperimentState;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentSummaryEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.JobEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
-import org.apache.airavata.registry.cpi.ResultOrderType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayRepository.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayRepository.java
index 2bb630d4d7..0975465307 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayRepository.java
@@ -17,21 +17,21 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.execution.model.GatewayEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.registry.core.entities.expcatalog.GatewayEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayUsageReportingCommandRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayUsageReportingCommandRepository.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayUsageReportingCommandRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayUsageReportingCommandRepository.java
index ec38ed0640..ab89808d6e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayUsageReportingCommandRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/GatewayUsageReportingCommandRepository.java
@@ -17,14 +17,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
+import org.apache.airavata.execution.model.GatewayUsageReportingCommandEntity;
+import org.apache.airavata.execution.model.GatewayUsageReportingPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.workspace.GatewayUsageReportingCommand;
-import org.apache.airavata.registry.core.entities.expcatalog.GatewayUsageReportingCommandEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.GatewayUsageReportingPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/JobRepository.java
similarity index 92%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/JobRepository.java
index 54e0f500b6..ca35bb7e33 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/JobRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.ArrayList;
@@ -25,15 +25,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.JobEntity;
+import org.apache.airavata.execution.model.JobPK;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.registry.core.entities.expcatalog.JobEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.JobPK;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/JobStatusRepository.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/JobStatusRepository.java
index 61bc9310b3..663faf5a54 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/JobStatusRepository.java
@@ -17,21 +17,21 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.List;
+import org.apache.airavata.execution.model.JobPK;
+import org.apache.airavata.execution.model.JobStatusEntity;
+import org.apache.airavata.execution.model.JobStatusPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.registry.core.entities.expcatalog.JobPK;
-import org.apache.airavata.registry.core.entities.expcatalog.JobStatusEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.JobStatusPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/NotificationRepository.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/NotificationRepository.java
index 93b066c33e..c289eb6fc8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/NotificationRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.apache.airavata.execution.model.NotificationEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.workspace.Notification;
-import org.apache.airavata.registry.core.entities.expcatalog.NotificationEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessErrorRepository.java
similarity index 86%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessErrorRepository.java
index 4b0998b096..f07676c86d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessErrorRepository.java
@@ -17,17 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.*;
+import org.apache.airavata.execution.model.ProcessErrorEntity;
+import org.apache.airavata.execution.model.ProcessErrorPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.ErrorModel;
 import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessErrorEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessErrorPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessInputRepository.java
similarity index 88%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessInputRepository.java
index 6fae1e1602..fdb2ee7e07 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessInputRepository.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.*;
+import org.apache.airavata.execution.model.ProcessInputEntity;
+import org.apache.airavata.execution.model.ProcessInputPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessInputEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessInputPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessOutputRepository.java
similarity index 88%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessOutputRepository.java
index 1b3084415c..243fba43ec 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessOutputRepository.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.*;
+import org.apache.airavata.execution.model.ProcessOutputEntity;
+import org.apache.airavata.execution.model.ProcessOutputPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessOutputEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessOutputPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessRepository.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessRepository.java
index 19a1b6f7f2..94d632d5a7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.math.BigDecimal;
@@ -26,17 +26,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.ProcessEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.airavata.model.status.ProcessStatus;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessStatusRepository.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessStatusRepository.java
index c0d8d078aa..87a36239eb 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessStatusRepository.java
@@ -17,23 +17,23 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.execution.model.ProcessStatusEntity;
+import org.apache.airavata.execution.model.ProcessStatusPK;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.airavata.model.status.ProcessStatus;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessStatusEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessStatusPK;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessWorkflowRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessWorkflowRepository.java
similarity index 88%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessWorkflowRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessWorkflowRepository.java
index 984fb417c9..076459c4c6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessWorkflowRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProcessWorkflowRepository.java
@@ -17,17 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.Collections;
 import java.util.List;
+import org.apache.airavata.execution.model.ProcessWorkflowEntity;
+import org.apache.airavata.execution.model.ProcessWorkflowPK;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.process.ProcessWorkflow;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessWorkflowEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessWorkflowPK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProjectRepository.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/ProjectRepository.java
index 7f985d94be..b42e062f46 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/ProjectRepository.java
@@ -17,21 +17,21 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.*;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.ProjectEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.Constants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
+import org.apache.airavata.execution.util.cpi.ResultOrderType;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.registry.core.entities.expcatalog.ProjectEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
-import org.apache.airavata.registry.cpi.ResultOrderType;
-import org.apache.airavata.registry.cpi.utils.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/QueueStatusRepository.java
similarity index 87%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/QueueStatusRepository.java
index 9acfa41e31..d67014f326 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/QueueStatusRepository.java
@@ -17,19 +17,19 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.apache.airavata.execution.model.QueueStatusEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.registry.core.entities.expcatalog.QueueStatusEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskErrorRepository.java
similarity index 86%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskErrorRepository.java
index a08840021b..417d9ee8cf 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskErrorRepository.java
@@ -17,17 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.List;
+import org.apache.airavata.execution.model.TaskErrorEntity;
+import org.apache.airavata.execution.model.TaskErrorPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.ErrorModel;
 import org.apache.airavata.model.task.TaskModel;
-import org.apache.airavata.registry.core.entities.expcatalog.TaskErrorEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.TaskErrorPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskRepository.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskRepository.java
index 58959d314a..52b9c50a9a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.util.ArrayList;
@@ -25,14 +25,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.airavata.common.util.AiravataUtils;
+import org.apache.airavata.execution.model.TaskEntity;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.task.TaskModel;
-import org.apache.airavata.registry.core.entities.expcatalog.TaskEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskStatusRepository.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskStatusRepository.java
index 1435416551..3d3112b1f9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/TaskStatusRepository.java
@@ -17,19 +17,19 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.List;
+import org.apache.airavata.execution.model.TaskStatusEntity;
+import org.apache.airavata.execution.model.TaskStatusPK;
+import org.apache.airavata.execution.util.ExpCatalogUtils;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.status.TaskState;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
-import org.apache.airavata.registry.core.entities.expcatalog.TaskStatusEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.TaskStatusPK;
-import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/UserRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/UserRepository.java
similarity index 84%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/UserRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/UserRepository.java
index 66887a05c9..87474632a2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/UserRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/UserRepository.java
@@ -17,17 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.expcatalog;
+package org.apache.airavata.execution.repository;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.airavata.execution.model.UserEntity;
+import org.apache.airavata.execution.model.UserPK;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.RegistryException;
 import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.registry.core.entities.expcatalog.UserEntity;
-import org.apache.airavata.registry.core.entities.expcatalog.UserPK;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.RegistryException;
 
 public class UserRepository extends ExpCatAbstractRepository<UserProfile, UserEntity, UserPK> {
     public UserRepository() {
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowCatAbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowCatAbstractRepository.java
similarity index 84%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowCatAbstractRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowCatAbstractRepository.java
index 83b9b7a133..4b71661d5d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowCatAbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowCatAbstractRepository.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.workflowcatalog;
+package org.apache.airavata.execution.repository;
 
 import jakarta.persistence.EntityManager;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.apache.airavata.registry.core.utils.JPAUtil.WorkflowCatalogJPAUtils;
+import org.apache.airavata.execution.util.AbstractRepository;
+import org.apache.airavata.execution.util.WorkflowCatalogJPAUtils;
 
 public class WorkflowCatAbstractRepository<T, E, Id> extends AbstractRepository<T, E, Id> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowRepository.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowRepository.java
index 70ca71e890..da9626807d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/workflowcatalog/WorkflowRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/repository/WorkflowRepository.java
@@ -17,19 +17,19 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories.workflowcatalog;
+package org.apache.airavata.execution.repository;
 
 import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.execution.model.workflow.AiravataWorkflowEntity;
+import org.apache.airavata.execution.util.*;
+import org.apache.airavata.execution.util.cpi.WorkflowCatalog;
+import org.apache.airavata.execution.util.cpi.WorkflowCatalogException;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.workflow.AiravataWorkflow;
-import org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowEntity;
-import org.apache.airavata.registry.core.utils.*;
-import org.apache.airavata.registry.cpi.WorkflowCatalog;
-import org.apache.airavata.registry.cpi.WorkflowCatalogException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/AnalyzerConstants.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/utils/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/AnalyzerConstants.java
index 7f47efbbcd..d77ff27a5a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/utils/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/AnalyzerConstants.java
@@ -17,9 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.metadata.analyzer.utils;
+package org.apache.airavata.execution.scheduler;
 
-public class Constants {
+public class AnalyzerConstants {
     public static final String METADATA_SCANNER_GROUP = "metadata.scanner.group";
     public static final String METADATA_SCANNER_TRIGGER = "metadata.scanner.trigger";
     public static final String METADATA_SCANNER_JOB = "metadata.scanner.job";
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ComputeResourceSelectionPolicy.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicy.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ComputeResourceSelectionPolicy.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicy.java
index 55f2a49756..9ac2378424 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ComputeResourceSelectionPolicy.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicy.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.engine;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.Optional;
 import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicyImpl.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicyImpl.java
index a50eec56e6..bfc6fe8e5b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ComputeResourceSelectionPolicyImpl.java
@@ -17,11 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection;
+package org.apache.airavata.execution.scheduler;
 
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.engine.ComputeResourceSelectionPolicy;
-import org.apache.airavata.metascheduler.core.utils.Utils;
 import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
 import org.apache.airavata.registry.api.RegistryService;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/DataAnalyzer.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzer.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/DataAnalyzer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzer.java
index 47d42da051..8bfca6092c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/DataAnalyzer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzer.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.engine;
+package org.apache.airavata.execution.scheduler;
 
 import org.quartz.Job;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzerImpl.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzerImpl.java
index 359ae01d66..99e44ee1e5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataAnalyzerImpl.java
@@ -17,13 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.metadata.analyzer.impl;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.Map;
 import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.engine.DataAnalyzer;
-import org.apache.airavata.metascheduler.core.utils.Utils;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
 import org.apache.airavata.registry.api.RegistryService;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataInterpreterService.java
similarity index 87%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataInterpreterService.java
index b85c897c7e..b24b21ebae 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DataInterpreterService.java
@@ -17,15 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.metadata.analyzer;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.airavata.common.server.IServer;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.metascheduler.metadata.analyzer.impl.DataAnalyzerImpl;
-import org.apache.airavata.metascheduler.metadata.analyzer.utils.Constants;
+import org.apache.airavata.common.server.IServer;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 import org.slf4j.Logger;
@@ -57,19 +55,19 @@ public class DataInterpreterService implements IServer {
             final double scanningInterval = ServerSettings.getDataAnalyzerScanningInterval();
 
             for (int i = 0; i < parallelJobs; i++) {
-                String name = Constants.METADATA_SCANNER_TRIGGER + "_" + i;
+                String name = AnalyzerConstants.METADATA_SCANNER_TRIGGER + "_" + i;
                 Trigger trigger = TriggerBuilder.newTrigger()
-                        .withIdentity(name, Constants.METADATA_SCANNER_GROUP)
+                        .withIdentity(name, AnalyzerConstants.METADATA_SCANNER_GROUP)
                         .startNow()
                         .withSchedule(SimpleScheduleBuilder.simpleSchedule()
                                 .withIntervalInSeconds((int) scanningInterval)
                                 .repeatForever())
                         .build();
 
-                String jobName = Constants.METADATA_SCANNER_JOB + "_" + i;
+                String jobName = AnalyzerConstants.METADATA_SCANNER_JOB + "_" + i;
 
                 JobDetail jobC = JobBuilder.newJob(DataAnalyzerImpl.class)
-                        .withIdentity(jobName, Constants.METADATA_SCANNER_JOB)
+                        .withIdentity(jobName, AnalyzerConstants.METADATA_SCANNER_JOB)
                         .build();
                 jobTriggerMap.put(jobC, trigger);
             }
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DefaultComputeResourceSelectionPolicy.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DefaultComputeResourceSelectionPolicy.java
index 38a0384bf1..cc7f04902e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/DefaultComputeResourceSelectionPolicy.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.Optional;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ExponentialBackOffReScheduler.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ExponentialBackOffReScheduler.java
index 98038d74b5..eb88364a05 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ExponentialBackOffReScheduler.java
@@ -17,17 +17,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.engine.ComputeResourceSelectionPolicy;
-import org.apache.airavata.metascheduler.core.engine.ReScheduler;
-import org.apache.airavata.metascheduler.core.utils.Utils;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.error.ExperimentNotFoundException;
 import org.apache.airavata.model.experiment.ExperimentModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/MultipleComputeResourcePolicy.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/MultipleComputeResourcePolicy.java
index 7cfa77a395..d8fbff7158 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/MultipleComputeResourcePolicy.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessReschedulingService.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessReschedulingService.java
similarity index 89%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessReschedulingService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessReschedulingService.java
index 7335cfddc6..d394e73e8a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessReschedulingService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessReschedulingService.java
@@ -17,14 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.airavata.common.server.IServer;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.metascheduler.process.scheduling.utils.Constants;
+import org.apache.airavata.common.server.IServer;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 import org.slf4j.Logger;
@@ -59,19 +58,19 @@ public class ProcessReschedulingService implements IServer {
             final double scanningInterval = ServerSettings.getMetaschedulerJobScanningInterval();
 
             for (int i = 0; i < parallelJobs; i++) {
-                String name = Constants.PROCESS_SCANNER_TRIGGER + "_" + i;
+                String name = SchedulerConstants.PROCESS_SCANNER_TRIGGER + "_" + i;
                 Trigger trigger = TriggerBuilder.newTrigger()
-                        .withIdentity(name, Constants.PROCESS_SCANNER_GROUP)
+                        .withIdentity(name, SchedulerConstants.PROCESS_SCANNER_GROUP)
                         .startNow()
                         .withSchedule(SimpleScheduleBuilder.simpleSchedule()
                                 .withIntervalInSeconds((int) scanningInterval)
                                 .repeatForever())
                         .build();
 
-                String jobName = Constants.PROCESS_SCANNER_JOB + "_" + i;
+                String jobName = SchedulerConstants.PROCESS_SCANNER_JOB + "_" + i;
 
                 JobDetail jobC = JobBuilder.newJob(ProcessScannerImpl.class)
-                        .withIdentity(jobName, Constants.PROCESS_SCANNER_JOB)
+                        .withIdentity(jobName, SchedulerConstants.PROCESS_SCANNER_JOB)
                         .build();
                 jobTriggerMap.put(jobC, trigger);
             }
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ProcessScanner.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScanner.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ProcessScanner.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScanner.java
index 7311a20d2c..fb2eb0ae8a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ProcessScanner.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScanner.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.engine;
+package org.apache.airavata.execution.scheduler;
 
 import org.quartz.Job;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScannerImpl.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScannerImpl.java
index 881adaf156..f583f09d2f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScannerImpl.java
@@ -17,14 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.List;
 import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.engine.ProcessScanner;
-import org.apache.airavata.metascheduler.core.engine.ReScheduler;
-import org.apache.airavata.metascheduler.core.utils.Utils;
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.airavata.registry.api.RegistryService;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScheduler.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScheduler.java
index 00bb2bc5b9..682022ef7e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessScheduler.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.api;
+package org.apache.airavata.execution.scheduler;
 
 /**
  * Provides interfaces for Process related scheduling operations
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessSchedulerImpl.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessSchedulerImpl.java
index bc14f76d6c..6937ec9302 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ProcessSchedulerImpl.java
@@ -17,16 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.api;
+package org.apache.airavata.execution.scheduler;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.api.ProcessScheduler;
-import org.apache.airavata.metascheduler.core.engine.ComputeResourceSelectionPolicy;
-import org.apache.airavata.metascheduler.core.utils.Utils;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.UserConfigurationDataModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ReScheduler.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ReScheduler.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ReScheduler.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ReScheduler.java
index 7f56dcb959..4f2c6e523d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/engine/ReScheduler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/ReScheduler.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.engine;
+package org.apache.airavata.execution.scheduler;
 
 import org.apache.airavata.model.process.ProcessModel;
 import org.apache.airavata.model.status.ProcessState;
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/SchedulerConstants.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/utils/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/SchedulerConstants.java
index 8accd2f0b3..e0754dd6e9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/process/scheduling/utils/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/SchedulerConstants.java
@@ -17,9 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.process.scheduling.utils;
+package org.apache.airavata.execution.scheduler;
 
-public class Constants {
+public class SchedulerConstants {
     public static final String PROCESS_SCANNER_GROUP = "process.scanner.group";
     public static final String PROCESS_SCANNER_TRIGGER = "prcoess.scanner.trigger";
     public static final String PROCESS_SCANNER_JOB = "process.scanner.job";
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/Utils.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/scheduler/Utils.java
index 5b5ab16678..ab5ddb7a59 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/scheduler/Utils.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.metascheduler.core.utils;
+package org.apache.airavata.execution.scheduler;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftClientPool;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/ExperimentService.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/ExperimentService.java
index 6d3f9ff43b..f970f9231c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/ExperimentService.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.experiment;
+package org.apache.airavata.execution.service;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -27,6 +27,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.airavata.compute.service.GroupResourceProfileService;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.messaging.service.EventPublisher;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.ExperimentSearchFields;
@@ -44,19 +47,12 @@ import org.apache.airavata.model.status.ProcessState;
 import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.task.TaskTypes;
 import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.service.exception.ServiceNotFoundException;
-import org.apache.airavata.compute.service.GroupResourceProfileService;
-import org.apache.airavata.messaging.service.EventPublisher;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
 import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/GatewayService.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/GatewayService.java
index ee565be5d0..8a544bb385 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/GatewayService.java
@@ -17,19 +17,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.gateway;
+package org.apache.airavata.execution.service;
 
 import java.util.List;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
 import org.apache.airavata.model.group.ResourceType;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Domain;
 import org.apache.airavata.sharing.registry.models.EntityType;
 import org.apache.airavata.sharing.registry.models.PermissionType;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/notification/NotificationService.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/NotificationService.java
similarity index 92%
rename from airavata-api/src/main/java/org/apache/airavata/service/notification/NotificationService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/NotificationService.java
index 3836fbae11..cbc67d683e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/notification/NotificationService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/NotificationService.java
@@ -17,13 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.notification;
+package org.apache.airavata.execution.service;
 
 import java.util.List;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
 import org.apache.airavata.model.workspace.Notification;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/ProjectService.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/ProjectService.java
index 43140239a1..f61f3a143d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/ProjectService.java
@@ -17,26 +17,22 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.project;
+package org.apache.airavata.execution.service;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
 import org.apache.airavata.model.experiment.ProjectSearchFields;
 import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
-import org.apache.airavata.service.exception.ServiceNotFoundException;
-import org.apache.airavata.sharing.service.SharingHelper;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
 import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.service.SharingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/context/RequestContext.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/RequestContext.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/service/context/RequestContext.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/RequestContext.java
index 4772489370..294e55b11c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/context/RequestContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/RequestContext.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.context;
+package org.apache.airavata.execution.service;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceAuthorizationException.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceAuthorizationException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceAuthorizationException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceAuthorizationException.java
index 1c9d8b8800..d4f2e10d5c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceAuthorizationException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceAuthorizationException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.exception;
+package org.apache.airavata.execution.service;
 
 public class ServiceAuthorizationException extends ServiceException {
     public ServiceAuthorizationException(String message) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceException.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceException.java
index 0e0aad1a58..c35896f739 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.exception;
+package org.apache.airavata.execution.service;
 
 public class ServiceException extends Exception {
     public ServiceException(String message) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceNotFoundException.java b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceNotFoundException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceNotFoundException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceNotFoundException.java
index c2d50e2fa1..54a60f48cd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/exception/ServiceNotFoundException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/service/ServiceNotFoundException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.exception;
+package org.apache.airavata.execution.service;
 
 public class ServiceNotFoundException extends ServiceException {
     public ServiceNotFoundException(String message) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/CancelCompletingTask.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/CancelCompletingTask.java
index 0223dc9b53..90924cbee1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/CancelCompletingTask.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.cancel;
+package org.apache.airavata.execution.task;
 
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.helix.task.TaskResult;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/CompletingTask.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/CompletingTask.java
index 118f01c82d..2a44b79eee 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/CompletingTask.java
@@ -17,13 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.completing;
+package org.apache.airavata.execution.task;
 
 import org.apache.airavata.compute.util.AgentAdaptor;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.experiment.ExperimentCleanupStrategy;
 import org.apache.airavata.model.status.ProcessState;
 import org.apache.helix.task.TaskResult;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/DataParsingTask.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/DataParsingTask.java
index 671568cd53..7ead086af4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/DataParsingTask.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing;
+package org.apache.airavata.execution.task;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
@@ -37,20 +37,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.apache.airavata.compute.util.AgentException;
-import org.apache.airavata.storage.util.StorageResourceAdaptor;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.impl.task.TaskOnFailException;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInput;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInputs;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskOutput;
-import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskOutputs;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
-import org.apache.airavata.helix.task.api.support.AdaptorSupport;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.server.CountMonitor;
+import org.apache.airavata.compute.util.AgentException;
+import org.apache.airavata.execution.orchestrator.AbstractTask;
+import org.apache.airavata.execution.orchestrator.AdaptorSupport;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
+import org.apache.airavata.execution.orchestrator.TaskOnFailException;
+import org.apache.airavata.execution.orchestrator.TaskParam;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
 import org.apache.airavata.model.appcatalog.parser.Parser;
@@ -63,10 +60,9 @@ import org.apache.airavata.model.data.replica.DataProductType;
 import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
 import org.apache.airavata.model.data.replica.ReplicaLocationCategory;
 import org.apache.airavata.model.data.replica.ReplicaPersistentType;
-import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
+import org.apache.airavata.storage.util.StorageResourceAdaptor;
 import org.apache.commons.io.FileUtils;
 import org.apache.helix.task.TaskResult;
 import org.apache.thrift.TException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/JobVerificationTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/JobVerificationTask.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/JobVerificationTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/JobVerificationTask.java
index 89e7f2eac9..7952d9c568 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/JobVerificationTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/JobVerificationTask.java
@@ -17,18 +17,18 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.staging;
+package org.apache.airavata.execution.task;
 
 import java.util.List;
-import org.apache.airavata.compute.util.AgentAdaptor;
-import org.apache.airavata.compute.util.CommandOutput;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
 import org.apache.airavata.compute.task.JobFactory;
 import org.apache.airavata.compute.task.JobManagerConfiguration;
 import org.apache.airavata.compute.task.RawCommandInfo;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.compute.util.AgentAdaptor;
+import org.apache.airavata.compute.util.CommandOutput;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/mock/MockTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/MockTask.java
similarity index 82%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/mock/MockTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/MockTask.java
index b065906a70..e7ce215d32 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/mock/MockTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/MockTask.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.mock;
+package org.apache.airavata.execution.task;
 
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.execution.orchestrator.AbstractTask;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.helix.task.TaskResult;
 
 @TaskDef(name = "Mock Task")
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInput.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInput.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInput.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInput.java
index bcda664a01..4737a33e24 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInput.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInput.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.models;
+package org.apache.airavata.execution.task;
 
 public class ParsingTaskInput {
     private String id;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInputs.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInputs.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInputs.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInputs.java
index f7f9f2bd4c..c7e3c308aa 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskInputs.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskInputs.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.models;
+package org.apache.airavata.execution.task;
 
 import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.helix.task.api.TaskParamType;
+import org.apache.airavata.execution.orchestrator.TaskParamType;
 
 public class ParsingTaskInputs implements TaskParamType {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutput.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutput.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutput.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutput.java
index e1e9a03a30..9b206f56e4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutput.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutput.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.models;
+package org.apache.airavata.execution.task;
 
 public class ParsingTaskOutput {
     private String id;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutputs.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutputs.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutputs.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutputs.java
index c9d14ba6a6..f1c3f77879 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/models/ParsingTaskOutputs.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTaskOutputs.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.models;
+package org.apache.airavata.execution.task;
 
 import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.helix.task.api.TaskParamType;
+import org.apache.airavata.execution.orchestrator.TaskParamType;
 
 public class ParsingTaskOutputs implements TaskParamType {
     private List<ParsingTaskOutput> outputs = new ArrayList<>();
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTriggeringTask.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTriggeringTask.java
index 40a1f06b45..37da75b66c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ParsingTriggeringTask.java
@@ -17,17 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing;
+package org.apache.airavata.execution.task;
 
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.impl.task.parsing.kafka.ProcessCompletionMessageSerializer;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.helix.task.TaskResult;
 import org.apache.kafka.clients.producer.*;
 import org.apache.kafka.common.serialization.StringSerializer;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ProcessCompletionMessage.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessage.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ProcessCompletionMessage.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessage.java
index 333dc1de00..f757ebf13c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/ProcessCompletionMessage.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessage.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing;
+package org.apache.airavata.execution.task;
 
 public class ProcessCompletionMessage {
     private String processId;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageDeserializer.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageDeserializer.java
similarity index 91%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageDeserializer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageDeserializer.java
index d6724cc138..1be12df581 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageDeserializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageDeserializer.java
@@ -17,10 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.kafka;
+package org.apache.airavata.execution.task;
 
 import java.util.Map;
-import org.apache.airavata.helix.impl.task.parsing.ProcessCompletionMessage;
 import org.apache.kafka.common.serialization.Deserializer;
 
 public class ProcessCompletionMessageDeserializer implements Deserializer<ProcessCompletionMessage> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageSerializer.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageSerializer.java
similarity index 90%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageSerializer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageSerializer.java
index 4ad251d3fd..3a9bedc38b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/parsing/kafka/ProcessCompletionMessageSerializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/ProcessCompletionMessageSerializer.java
@@ -17,10 +17,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.parsing.kafka;
+package org.apache.airavata.execution.task;
 
 import java.util.Map;
-import org.apache.airavata.helix.impl.task.parsing.ProcessCompletionMessage;
 import org.apache.kafka.common.serialization.Serializer;
 
 public class ProcessCompletionMessageSerializer implements Serializer<ProcessCompletionMessage> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/RemoteJobCancellationTask.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/RemoteJobCancellationTask.java
index d5269dffcb..03460572a0 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/RemoteJobCancellationTask.java
@@ -17,20 +17,20 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.cancel;
+package org.apache.airavata.execution.task;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.airavata.compute.util.AgentAdaptor;
-import org.apache.airavata.compute.util.CommandOutput;
-import org.apache.airavata.helix.impl.task.AiravataTask;
-import org.apache.airavata.helix.impl.task.TaskContext;
 import org.apache.airavata.compute.task.JobFactory;
 import org.apache.airavata.compute.task.JobManagerConfiguration;
 import org.apache.airavata.compute.task.RawCommandInfo;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
+import org.apache.airavata.compute.util.AgentAdaptor;
+import org.apache.airavata.compute.util.CommandOutput;
+import org.apache.airavata.execution.orchestrator.AiravataTask;
+import org.apache.airavata.execution.orchestrator.TaskContext;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
 import org.apache.airavata.model.job.JobModel;
 import org.apache.airavata.model.status.JobState;
 import org.apache.airavata.model.status.JobStatus;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java b/airavata-api/src/main/java/org/apache/airavata/execution/task/WorkflowCancellationTask.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/task/WorkflowCancellationTask.java
index 1d79c58c0b..3ae5d9e548 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/task/WorkflowCancellationTask.java
@@ -17,13 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.helix.impl.task.cancel;
+package org.apache.airavata.execution.task;
 
 import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskDef;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
+import org.apache.airavata.execution.orchestrator.AbstractTask;
+import org.apache.airavata.execution.orchestrator.TaskDef;
+import org.apache.airavata.execution.orchestrator.TaskHelper;
+import org.apache.airavata.execution.orchestrator.TaskParam;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AbstractRepository.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AbstractRepository.java
index 2d079f6411..f757960547 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AbstractRepository.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.repositories;
+package org.apache.airavata.execution.util;
 
 import com.github.dozermapper.core.Mapper;
 import jakarta.persistence.EntityManager;
@@ -25,9 +25,6 @@ import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.registry.core.utils.Committer;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/AiravataJobState.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AiravataJobState.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/common/utils/AiravataJobState.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AiravataJobState.java
index 7130e7ecf8..38af0d4dd3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/AiravataJobState.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AiravataJobState.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.common.utils;
+package org.apache.airavata.execution.util;
 
 /*
 These are the job statuses shared in database level between orchestrator and
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogDBInitConfig.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogDBInitConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogDBInitConfig.java
index 3721932bb0..4cf3eb5dcc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogDBInitConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogDBInitConfig.java
@@ -17,13 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.db.DBInitConfig;
 import org.apache.airavata.common.db.JDBCConfig;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.compute.repository.GwyResourceProfileRepository;
+import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 
 public class AppCatalogDBInitConfig implements DBInitConfig {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJDBCConfig.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogJDBCConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJDBCConfig.java
index 528e34e007..318497bcdc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJDBCConfig.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class AppCatalogJDBCConfig implements JDBCConfig {
     private static final String APPCATALOG_JDBC_DRIVER = "airavata.jdbc.driver";
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/AppCatalogJPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJPAUtils.java
similarity index 73%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/AppCatalogJPAUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJPAUtils.java
index 0a294dc0f8..7ddf64d843 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/AppCatalogJPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogJPAUtils.java
@@ -17,13 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.JPAUtil;
+package org.apache.airavata.execution.util;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.db.JPAUtils;
-import org.apache.airavata.registry.core.utils.AppCatalogJDBCConfig;
 
 public class AppCatalogJPAUtils {
 
@@ -31,10 +30,20 @@ public class AppCatalogJPAUtils {
     // the other appcatalog_data persistence context in airavata-registry-core
     public static final String PERSISTENCE_UNIT_NAME = "appcatalog_data_new";
     private static final JDBCConfig JDBC_CONFIG = new AppCatalogJDBCConfig();
-    private static final EntityManagerFactory factory =
-            JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (AppCatalogJPAUtils.class) {
+                if (factory == null) {
+                    factory = JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogUtils.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogUtils.java
index 439269d840..00da0e044f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/AppCatalogUtils.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import java.util.UUID;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/Committer.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/Committer.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/Committer.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/Committer.java
index ed54860684..8895a897c8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/Committer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/Committer.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 @FunctionalInterface
 public interface Committer<T, R> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/CsvStringConverter.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/CsvStringConverter.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/CsvStringConverter.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/CsvStringConverter.java
index 5a4a5a0fdd..062c7e9f5c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/CsvStringConverter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/CsvStringConverter.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.DozerConverter;
+package org.apache.airavata.execution.util;
 
 import com.github.dozermapper.core.DozerConverter;
 import java.util.Arrays;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/CustomBeanFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/CustomBeanFactory.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/CustomBeanFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/CustomBeanFactory.java
index f510e4869c..8e03752b97 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/CustomBeanFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/CustomBeanFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import com.github.dozermapper.core.BeanFactory;
 import com.github.dozermapper.core.config.BeanContainer;
@@ -26,11 +26,11 @@ import com.github.dozermapper.core.util.ReflectionUtils;
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType;
 import org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity;
 import org.apache.airavata.compute.model.GroupComputeResourcePrefEntity;
 import org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity;
+import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
+import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TFieldIdEnum;
 import org.apache.thrift.meta_data.FieldMetaData;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DBConstants.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/DBConstants.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DBConstants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/DBConstants.java
index d0af0e3ca4..c93a0f6c63 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DBConstants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/DBConstants.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 public class DBConstants {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/model/util/ExecutionType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExecutionType.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/model/util/ExecutionType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExecutionType.java
index a5e63fec50..0dcd125f9c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/model/util/ExecutionType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExecutionType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.model.util;
+package org.apache.airavata.execution.util;
 
 public enum ExecutionType {
     UNKNOWN,
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogDBInitConfig.java
similarity index 93%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogDBInitConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogDBInitConfig.java
index b549b02c37..c995de7a37 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogDBInitConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogDBInitConfig.java
@@ -17,16 +17,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.db.DBInitConfig;
 import org.apache.airavata.common.db.JDBCConfig;
-import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.execution.repository.GatewayRepository;
+import org.apache.airavata.execution.repository.UserRepository;
 import org.apache.airavata.model.user.UserProfile;
 import org.apache.airavata.model.workspace.Gateway;
 import org.apache.airavata.model.workspace.GatewayApprovalStatus;
-import org.apache.airavata.registry.core.repositories.expcatalog.GatewayRepository;
-import org.apache.airavata.registry.core.repositories.expcatalog.UserRepository;
 
 public class ExpCatalogDBInitConfig implements DBInitConfig {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJDBCConfig.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogJDBCConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJDBCConfig.java
index 0ef1e336ee..7ec36143e5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJDBCConfig.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class ExpCatalogJDBCConfig implements JDBCConfig {
     private static final String EXPCATALOG_JDBC_DRIVER = "airavata.jdbc.driver";
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/ExpCatalogJPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJPAUtils.java
similarity index 70%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/ExpCatalogJPAUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJPAUtils.java
index 7961813696..3a7fbc52c5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/ExpCatalogJPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogJPAUtils.java
@@ -17,21 +17,30 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.JPAUtil;
+package org.apache.airavata.execution.util;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.db.JPAUtils;
-import org.apache.airavata.registry.core.utils.ExpCatalogJDBCConfig;
 
 public class ExpCatalogJPAUtils {
     public static final String PERSISTENCE_UNIT_NAME = "experiment_data_new";
     private static final JDBCConfig JDBC_CONFIG = new ExpCatalogJDBCConfig();
-    private static final EntityManagerFactory factory =
-            JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (ExpCatalogJPAUtils.class) {
+                if (factory == null) {
+                    factory = JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogUtils.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogUtils.java
index 863a0b820d..d69320bde1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExpCatalogUtils.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import java.util.UUID;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExperimentModelUtil.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ExperimentModelUtil.java
index 8d4e3cbf68..7812cd6533 100644
--- a/airavata-api/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ExperimentModelUtil.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.model.util;
+package org.apache.airavata.execution.util;
 
 import java.util.List;
 import org.apache.airavata.model.application.io.InputDataObjectType;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ObjectMapperSingleton.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ObjectMapperSingleton.java
index 452f5a555d..654b87d1e8 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ObjectMapperSingleton.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;
diff --git a/airavata-api/src/main/java/org/apache/airavata/model/util/ProjectModelUtil.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ProjectModelUtil.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/model/util/ProjectModelUtil.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ProjectModelUtil.java
index effbcfe61d..e3d8e5d812 100644
--- a/airavata-api/src/main/java/org/apache/airavata/model/util/ProjectModelUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ProjectModelUtil.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.model.util;
+package org.apache.airavata.execution.util;
 
 import org.apache.airavata.model.workspace.Project;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/QueryConstants.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/QueryConstants.java
index f3ec2818a1..f5fa64e5a9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/QueryConstants.java
@@ -17,12 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
-import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowEntity;
 import org.apache.airavata.compute.model.*;
-import org.apache.airavata.registry.core.entities.expcatalog.*;
+import org.apache.airavata.execution.model.*;
+import org.apache.airavata.execution.model.workflow.AiravataWorkflowEntity;
+import org.apache.airavata.model.user.UserProfile;
 import org.apache.airavata.storage.model.DataProductEntity;
 import org.apache.airavata.storage.model.GridftpEndpointEntity;
 import org.apache.airavata.storage.model.StoragePreferenceEntity;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryConstants.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryConstants.java
index b927e592e9..c7983c38ad 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryConstants.java
@@ -17,13 +17,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.service.util;
+package org.apache.airavata.execution.util;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.airavata.messaging.util.DBEventService;
 
-public class Constants {
+public class RegistryConstants {
     public static final String REGISTRY_SERVER_PORT = "regserver.server.port";
     public static final String REGISTRY_SERVER_HOST = "regserver.server.host";
     public static final String REGISTRY_SERVER_MIN_THREADS = "regserver.server.min.threads";
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/RegistryException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/RegistryException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryException.java
index d42f8977a4..d73d14cbd1 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/RegistryException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core;
+package org.apache.airavata.execution.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryServiceClientFactory.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryServiceClientFactory.java
index 8496a24870..2da2f7d31c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/RegistryServiceClientFactory.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.client;
+package org.apache.airavata.execution.util;
 
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/RepCatalogJPAUtils.java
similarity index 73%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/RepCatalogJPAUtils.java
index 72b016335c..be3baebd1b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/RepCatalogJPAUtils.java
@@ -17,13 +17,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.JPAUtil;
+package org.apache.airavata.execution.util;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.db.JPAUtils;
-import org.apache.airavata.registry.core.utils.ReplicaCatalogJDBCConfig;
 
 public class RepCatalogJPAUtils {
 
@@ -31,10 +30,20 @@ public class RepCatalogJPAUtils {
     // persistence context in airavata-registry-core
     public static final String PERSISTENCE_UNIT_NAME = "replicacatalog_data_new";
     private static final JDBCConfig JDBC_CONFIG = new ReplicaCatalogJDBCConfig();
-    private static final EntityManagerFactory factory =
-            JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (RepCatalogJPAUtils.class) {
+                if (factory == null) {
+                    factory = JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogDBInitConfig.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogDBInitConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogDBInitConfig.java
index a30f1fd377..0c4c503670 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogDBInitConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogDBInitConfig.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import org.apache.airavata.common.db.DBInitConfig;
 import org.apache.airavata.common.db.JDBCConfig;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogJDBCConfig.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogJDBCConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogJDBCConfig.java
index 92dfeb3f68..a297ae59bf 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/ReplicaCatalogJDBCConfig.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class ReplicaCatalogJDBCConfig implements JDBCConfig {
     private static final String REPLICA_CATALOG_JDBC_DRIVER = "airavata.jdbc.driver";
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/StorageDateConverter.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/StorageDateConverter.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/StorageDateConverter.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/StorageDateConverter.java
index b41ff74af9..38ec179c39 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/StorageDateConverter.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/StorageDateConverter.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.DozerConverter;
+package org.apache.airavata.execution.util;
 
 import com.github.dozermapper.core.DozerConverter;
 import java.sql.Timestamp;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogDBInitConfig.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogDBInitConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogDBInitConfig.java
index e83b5ff6bb..10cfe3233a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogDBInitConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogDBInitConfig.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import org.apache.airavata.common.db.DBInitConfig;
 import org.apache.airavata.common.db.JDBCConfig;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJDBCConfig.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogJDBCConfig.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJDBCConfig.java
index c9d11c7206..5740fa946e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJDBCConfig.java
@@ -17,11 +17,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class WorkflowCatalogJDBCConfig implements JDBCConfig {
     private static final String WORKFLOW_CATALOG_JDBC_DRIVER = "airavata.jdbc.driver";
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/WorkflowCatalogJPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJPAUtils.java
similarity index 70%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/WorkflowCatalogJPAUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJPAUtils.java
index ff78434b0d..a428e02261 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/WorkflowCatalogJPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogJPAUtils.java
@@ -17,22 +17,31 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils.JPAUtil;
+package org.apache.airavata.execution.util;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.db.JPAUtils;
-import org.apache.airavata.registry.core.utils.WorkflowCatalogJDBCConfig;
 
 public class WorkflowCatalogJPAUtils {
 
     private static final String PERSISTENCE_UNIT_NAME = "workflowcatalog_data_new";
     private static final JDBCConfig JDBC_CONFIG = new WorkflowCatalogJDBCConfig();
-    private static final EntityManagerFactory factory =
-            JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (WorkflowCatalogJPAUtils.class) {
+                if (factory == null) {
+                    factory = JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogUtils.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogUtils.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogUtils.java
index 7b28f46e41..b617aaefed 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowCatalogUtils.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.core.utils;
+package org.apache.airavata.execution.util;
 
 import java.util.UUID;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowContext.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowContext.java
index b0efd51163..4d20ef6b2a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/WorkflowContext.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.common.context;
+package org.apache.airavata.execution.util;
 
 import org.apache.airavata.common.config.RequestContext;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalog.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalog.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalog.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalog.java
index 711ef2b01f..c5bcb04b49 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalog.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalog.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public interface AppCatalog {
     /**
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalogException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalogException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalogException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalogException.java
index 14f7b2e761..e7c744bd74 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/AppCatalogException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/AppCatalogException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public class AppCatalogException extends Exception {
     private static final long serialVersionUID = -2849422320139467602L;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationDeployment.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationDeployment.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationDeployment.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationDeployment.java
index 61c982365c..880085cb07 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationDeployment.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationDeployment.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationInterface.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationInterface.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationInterface.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationInterface.java
index ee8c032a92..190dbb323f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ApplicationInterface.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ApplicationInterface.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/CompositeIdentifier.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/CompositeIdentifier.java
index 1975ab3364..75c2fc7106 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/CompositeIdentifier.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 /**
  * This class is to uniquely identify third layer child objects. For example, workflow node status object can be
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ComputeResource.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ComputeResource.java
index 1854d4a699..836346309f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ComputeResource.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Constants.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Constants.java
index ad350c8118..cd3f12cdd5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Constants.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi.utils;
+package org.apache.airavata.execution.util.cpi;
 
 public class Constants {
     public final class FieldConstants {
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataProductInterface.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataProductInterface.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataProductInterface.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataProductInterface.java
index 40c8a84aaf..c251f4fe23 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataProductInterface.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataProductInterface.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import org.apache.airavata.model.data.replica.DataProductModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataReplicaLocationInterface.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataReplicaLocationInterface.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataReplicaLocationInterface.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataReplicaLocationInterface.java
index 8a3876358d..da6d14f25a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/DataReplicaLocationInterface.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/DataReplicaLocationInterface.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatChildDataType.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatChildDataType.java
index 08d6784527..ae651cf35a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatChildDataType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public enum ExpCatChildDataType {
     EXPERIMENT_INPUT,
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatParentDataType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatParentDataType.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatParentDataType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatParentDataType.java
index 9077fe49dd..06baa18058 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExpCatParentDataType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExpCatParentDataType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public enum ExpCatParentDataType {
     APPLiCATION_CATALOG,
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalog.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalog.java
index 35892a72bd..3d301c8187 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalog.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import java.util.Map;
@@ -47,7 +47,7 @@ public interface ExperimentCatalog {
      *                       etc
      * @param dependentIdentifiers contains the identifier if the object that is going to add is not a top
      *                            level object in the data model. This object can be a simple string or a
-     *                             org.apache.airavata.registry.cpi.CompositeIdentifier type if it is a child element
+     *                             org.apache.airavata.execution.util.cpi.CompositeIdentifier type if it is a child element
      *                             with multiple identifiers
      * @return return the identifier to identify the object
      */
@@ -75,7 +75,7 @@ public interface ExperimentCatalog {
      *                   identifier will be generated experimentID
      * @param fieldName Field which need to be updated in the registry. In Experiment_Basic_Type, if you want to update the
      *              description, field will be "description". Field names are defined in
-     *              org.apache.airavata.registry.cpi.utils.Constants
+     *              org.apache.airavata.execution.util.cpi.Constants
      * @param value Value by which the given field need to be updated. If the field is "description", that field will be
      *              updated by given value
      */
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogException.java
index d5f56daea1..7fa813b8d9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public class ExperimentCatalogException extends Exception {
     private static final long serialVersionUID = -2849422320139467602L;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogModelType.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogModelType.java
index 0c02bb8a6e..0c4755cb0f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ExperimentCatalogModelType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public enum ExperimentCatalogModelType {
     APPLiCATION_CATALOG,
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyClientCredential.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyClientCredential.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyClientCredential.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyClientCredential.java
index 8844c409ae..77d9421103 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyClientCredential.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyClientCredential.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.Map;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyResourceProfile.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyResourceProfile.java
index 856c118c68..c039dca15b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/GwyResourceProfile.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/Registry.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Registry.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/Registry.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Registry.java
index e5538e12d9..7101124bbe 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/Registry.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/Registry.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public interface Registry {
     public ExperimentCatalog getExperimentCatalog() throws RegistryException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/RegistryException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/RegistryException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/RegistryException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/RegistryException.java
index cbec7acaff..784eab3442 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/RegistryException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/RegistryException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public class RegistryException extends Exception {
     private static final long serialVersionUID = -2849422320139467602L;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalog.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalog.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalog.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalog.java
index d7e5421b8c..d4c7e460cc 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalog.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalog.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 /*
 Included for backwards compatibility
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalogException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalogException.java
similarity index 95%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalogException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalogException.java
index a8b95545a9..3bf00bdafe 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalogException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ReplicaCatalogException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public class ReplicaCatalogException extends RegistryException {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ResultOrderType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ResultOrderType.java
new file mode 100644
index 0000000000..6fdf742266
--- /dev/null
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/ResultOrderType.java
@@ -0,0 +1,48 @@
+/**
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.airavata.execution.util.cpi; /*
+                                                 *
+                                                 * Licensed to the Apache Software Foundation (ASF) under one
+                                                 * or more contributor license agreements.  See the NOTICE file
+                                                 * distributed with this work for additional information
+                                                 * regarding copyright ownership.  The ASF licenses this file
+                                                 * to you under the Apache License, Version 2.0 (the
+                                                 * "License"); you may not use this file except in compliance
+                                                 * with the License.  You may obtain a copy of the License at
+                                                 *
+                                                 *   http://www.apache.org/licenses/LICENSE-2.0
+                                                 *
+                                                 * Unless required by applicable law or agreed to in writing,
+                                                 * software distributed under the License is distributed on an
+                                                 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+                                                 * KIND, either express or implied.  See the License for the
+                                                 * specific language governing permissions and limitations
+                                                 * under the License.
+                                                 *
+                                                 */
+
+/**
+ * Enum to specify the order type for a specific column when
+ * retrieving results
+ */
+public enum ResultOrderType {
+    ASC,
+    DESC
+}
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/StatusType.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StatusType.java
similarity index 94%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/StatusType.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StatusType.java
index da1eb98007..065b4e1c22 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/utils/StatusType.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StatusType.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi.utils;
+package org.apache.airavata.execution.util.cpi;
 
 public enum StatusType {
     EXPERIMENT,
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StorageResource.java
similarity index 98%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StorageResource.java
index 6ff90b6b02..5e0e47591f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/StorageResource.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import java.util.Map;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/UsrResourceProfile.java
similarity index 99%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/UsrResourceProfile.java
index ac496f1b97..b3b2c9a690 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/UsrResourceProfile.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import java.util.List;
 import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalog.java
similarity index 97%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalog.java
index 58efcc534c..5542336940 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalog.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 import org.apache.airavata.model.workflow.AiravataWorkflow;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalogException.java b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalogException.java
similarity index 96%
rename from airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalogException.java
rename to airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalogException.java
index 8d00095341..dcc4c14d42 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalogException.java
+++ b/airavata-api/src/main/java/org/apache/airavata/execution/util/cpi/WorkflowCatalogException.java
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.cpi;
+package org.apache.airavata.execution.util.cpi;
 
 public class WorkflowCatalogException extends Exception {
     private static final long serialVersionUID = -2849422320139467602L;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java
index 54f8d99837..b3b3cabd38 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java
@@ -20,11 +20,10 @@
 package org.apache.airavata.messaging.handler;
 
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.util.DBEventService;
-import org.apache.airavata.messaging.handler.DBEventMessageHandler;
 import org.apache.airavata.messaging.service.MessagingFactory;
 import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.messaging.service.Subscriber;
+import org.apache.airavata.messaging.util.DBEventService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java
index 126275e3f5..bf7e98c50c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java
@@ -21,7 +21,6 @@ package org.apache.airavata.messaging.handler;
 
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.server.IServer;
-import org.apache.airavata.messaging.handler.DBEventManagerMessagingFactory;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java
index e676f01f63..950bef8c46 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java
@@ -23,13 +23,12 @@ import java.util.Collections;
 import java.util.List;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.messaging.util.DBEventManagerConstants;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.messaging.util.DBEventManagerException;
-import org.apache.airavata.messaging.handler.DBEventManagerMessagingFactory;
-import org.apache.airavata.messaging.util.DbEventManagerZkUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
+import org.apache.airavata.messaging.util.DBEventManagerConstants;
+import org.apache.airavata.messaging.util.DBEventManagerException;
+import org.apache.airavata.messaging.util.DbEventManagerZkUtils;
 import org.apache.airavata.model.dbevent.DBEventMessage;
 import org.apache.airavata.model.dbevent.DBEventMessageContext;
 import org.apache.airavata.model.messaging.event.MessageType;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java
index 54e6ac769c..3b6cc3a008 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java
@@ -25,8 +25,8 @@ import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
 import java.io.IOException;
-import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java
index 90e1ae39a9..d6d606cf8b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java
@@ -25,8 +25,8 @@ import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
 import java.io.IOException;
-import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.util.AiravataUtils;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java
index 594744563e..35cea18eb2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java
@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageHandler;
 import org.apache.airavata.messaging.service.MessagingFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java
index c1afce6b10..9e46ac992b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.UUID;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.messaging.service.MessageContext;
-import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.model.messaging.event.ExperimentIntermediateOutputsEvent;
 import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
 import org.apache.airavata.model.messaging.event.ExperimentSubmitEvent;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java
index c56a7e0bf9..29012862e9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java
@@ -21,14 +21,14 @@ package org.apache.airavata.messaging.service;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.util.DBEventManagerConstants;
-import org.apache.airavata.messaging.util.RabbitMQProperties;
 import org.apache.airavata.messaging.handler.ExperimentConsumer;
 import org.apache.airavata.messaging.handler.MessageConsumer;
 import org.apache.airavata.messaging.handler.ProcessConsumer;
 import org.apache.airavata.messaging.handler.StatusConsumer;
-import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.messaging.util.DBEventManagerConstants;
+import org.apache.airavata.messaging.util.RabbitMQProperties;
 import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
 import org.apache.airavata.model.messaging.event.JobIdentifier;
 import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java
index 23d53ff3d7..195fe1fc3f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java
@@ -29,8 +29,6 @@ import java.io.IOException;
 import java.util.function.Function;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.messaging.service.MessageContext;
-import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.messaging.util.RabbitMQProperties;
 import org.apache.airavata.model.messaging.event.Message;
 import org.apache.thrift.TException;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java
index edb643a74e..302b474e1e 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java
@@ -32,7 +32,6 @@ import java.util.Map;
 import java.util.function.BiFunction;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.messaging.util.RabbitMQProperties;
-import org.apache.airavata.messaging.service.Subscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java
index 6e49b89770..03fd581d0d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java
@@ -20,8 +20,6 @@
 package org.apache.airavata.messaging.util;
 
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.util.DBEventManagerConstants;
-import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java
index 5da7189a1b..982a7a2803 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java
@@ -20,8 +20,8 @@
 package org.apache.airavata.messaging.util;
 
 import java.util.List;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ResultOrderType.java b/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ResultOrderType.java
deleted file mode 100644
index 934a8d8cd2..0000000000
--- a/airavata-api/src/main/java/org/apache/airavata/registry/cpi/ResultOrderType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.airavata.registry.cpi; /*
-                                           *
-                                           * Licensed to the Apache Software Foundation (ASF) under one
-                                           * or more contributor license agreements.  See the NOTICE file
-                                           * distributed with this work for additional information
-                                           * regarding copyright ownership.  The ASF licenses this file
-                                           * to you under the Apache License, Version 2.0 (the
-                                           * "License"); you may not use this file except in compliance
-                                           * with the License.  You may obtain a copy of the License at
-                                           *
-                                           *   http://www.apache.org/licenses/LICENSE-2.0
-                                           *
-                                           * Unless required by applicable law or agreed to in writing,
-                                           * software distributed under the License is distributed on an
-                                           * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-                                           * KIND, either express or implied.  See the License for the
-                                           * specific language governing permissions and limitations
-                                           * under the License.
-                                           *
-                                           */
-
-/**
- * Enum to specify the order type for a specific column when
- * retrieving results
- */
-public enum ResultOrderType {
-    ASC,
-    DESC
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java
index 366cd88f15..e5b52a7ce2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java
@@ -26,11 +26,22 @@ import org.apache.airavata.common.db.JDBCConfig;
 public class JPAUtils {
     private static final String PERSISTENCE_UNIT_NAME = "profile_service";
     private static final JDBCConfig JDBC_CONFIG = new ProfileServiceJDBCConfig();
-    private static final EntityManagerFactory factory =
-            org.apache.airavata.common.db.JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (JPAUtils.class) {
+                if (factory == null) {
+                    factory = org.apache.airavata.common.db.JPAUtils.getEntityManagerFactory(
+                            PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 
     public static <R> R execute(Committer<EntityManager, R> committer) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java
index 66e2f20975..b8af6604e3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java
@@ -20,8 +20,8 @@
 package org.apache.airavata.security.profile.commons.utils;
 
 import java.net.URI;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index de94c63284..7826e4ee0b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -28,14 +28,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.apache.airavata.model.user.Status;
 import org.apache.airavata.model.user.UserProfile;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.security.profile.iam.admin.services.core.interfaces.TenantManagementInterface;
+import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.KeycloakBuilder;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java
index f64f41759a..5ea31ee91a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.security.repository;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.security.util.UserStore;
 import org.apache.airavata.security.util.UserStoreException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java
index 977772af94..eab7368d0c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java
@@ -21,8 +21,8 @@ package org.apache.airavata.security.repository;
 
 import javax.sql.DataSource;
 import org.apache.airavata.common.db.DBUtil;
-import org.apache.airavata.security.util.UserStoreException;
 import org.apache.airavata.security.util.PasswordDigester;
+import org.apache.airavata.security.util.UserStoreException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java
index 39616b7990..5ec2c8d10a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.security.repository;
 
+import org.apache.airavata.security.util.PasswordDigester;
 import org.apache.airavata.security.util.UserStore;
 import org.apache.airavata.security.util.UserStoreException;
-import org.apache.airavata.security.util.PasswordDigester;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java
index bb62829f96..bef54d0ead 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java
@@ -19,22 +19,22 @@
 */
 package org.apache.airavata.security.service;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.credential.util.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
 import org.apache.airavata.sharing.registry.models.*;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
+import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java
index 18deb2071b..e0a3cc9f61 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java
@@ -28,26 +28,26 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.Constants;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.ThriftUtils;
-import org.apache.airavata.credential.util.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.security.AuthzToken;
 import org.apache.airavata.model.workspace.Gateway;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.security.service.authzcache.*;
-import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
+import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.models.UserGroup;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
+import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
 import org.apache.http.Consts;
 import org.apache.http.HttpHeaders;
 import org.apache.http.NameValuePair;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java
index f47c585f9f..f3c131ee18 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.security.service;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.security.util.AiravataSecurityException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java
index 49529a9d78..c7f94b3748 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java
@@ -21,8 +21,8 @@ package org.apache.airavata.security.service.authzcache;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java
index 0065ab06d5..79c7f38bb6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.security.service.authzcache;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.security.util.AiravataSecurityException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java
index 1446f27181..d4c70f9de3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java
@@ -23,16 +23,16 @@ import java.util.HashMap;
 import java.util.Map;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.Constants;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.server.CountMonitor;
 import org.apache.airavata.model.error.AuthorizationException;
 import org.apache.airavata.model.security.AuthzToken;
-import org.apache.airavata.common.server.CountMonitor;
-import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.security.service.AiravataSecurityManager;
 import org.apache.airavata.security.service.IdentityContext;
 import org.apache.airavata.security.service.SecurityManagerFactory;
+import org.apache.airavata.security.util.AiravataSecurityException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java
index 151648e5bd..7a5e1ea4f9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java
@@ -28,9 +28,6 @@ import java.util.List;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.apache.airavata.security.util.AbstractAuthenticator;
-import org.apache.airavata.security.util.Authenticator;
-import org.apache.airavata.security.util.UserStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java b/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
index 29d70b2f34..4ecc2c6d77 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
@@ -22,8 +22,6 @@ package org.apache.airavata.security.util;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import org.apache.airavata.security.util.SecurityUtil;
-import org.apache.airavata.security.util.UserStoreException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java
index 6a9eda09eb..16afd1f3af 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java
@@ -22,15 +22,15 @@ package org.apache.airavata.sharing.handler;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.*;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.db.DBInitializer;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.sharing.model.*;
-import org.apache.airavata.sharing.repository.*;
-import org.apache.airavata.sharing.util.DBConstants;
-import org.apache.airavata.sharing.util.SharingRegistryDBInitConfig;
 import org.apache.airavata.sharing.registry.models.*;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
 import org.apache.airavata.sharing.registry.service.cpi.sharing_cpiConstants;
+import org.apache.airavata.sharing.repository.*;
+import org.apache.airavata.sharing.util.DBConstants;
+import org.apache.airavata.sharing.util.SharingRegistryDBInitConfig;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java
index e2cdbfa7b5..0b45df4113 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.sharing.handler;
 
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.util.ThriftUtils;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessageHandler;
@@ -32,13 +32,13 @@ import org.apache.airavata.model.group.ResourceType;
 import org.apache.airavata.model.user.UserProfile;
 import org.apache.airavata.model.workspace.Gateway;
 import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
 import org.apache.airavata.sharing.registry.models.Domain;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.PermissionType;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.models.User;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
+import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory;
 import org.apache.airavata.sharing.util.ThriftDataModelConversion;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java
index b937ff7432..7f424ca68d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java
@@ -21,12 +21,12 @@ package org.apache.airavata.sharing.handler;
 
 import java.util.List;
 import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.util.DBEventManagerConstants;
-import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.messaging.service.MessageContext;
 import org.apache.airavata.messaging.service.MessagingFactory;
 import org.apache.airavata.messaging.service.Publisher;
 import org.apache.airavata.messaging.service.Subscriber;
+import org.apache.airavata.messaging.util.DBEventManagerConstants;
+import org.apache.airavata.messaging.util.DBEventService;
 import org.apache.airavata.model.dbevent.DBEventMessage;
 import org.apache.airavata.model.dbevent.DBEventMessageContext;
 import org.apache.airavata.model.dbevent.DBEventSubscriber;
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java
index 33f5ab55cf..82999af72a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java
@@ -25,11 +25,11 @@ import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.util.Committer;
 import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.util.JPAUtils;
 import org.apache.airavata.sharing.util.ObjectMapperSingleton;
-import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java
index a31ae7bf39..56afa65c7d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java
@@ -22,9 +22,9 @@ package org.apache.airavata.sharing.repository;
 import java.util.*;
 import org.apache.airavata.sharing.model.EntityEntity;
 import org.apache.airavata.sharing.model.EntityPK;
+import org.apache.airavata.sharing.registry.models.*;
 import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.util.SharingRegistryJDBCConfig;
-import org.apache.airavata.sharing.registry.models.*;
 
 public class EntityRepository extends AbstractRepository<Entity, EntityEntity, EntityPK> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java
index 4b8e2274ab..83e9a511e6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java
@@ -24,8 +24,8 @@ import org.apache.airavata.sharing.model.GroupMembershipEntity;
 import org.apache.airavata.sharing.model.GroupMembershipPK;
 import org.apache.airavata.sharing.model.UserEntity;
 import org.apache.airavata.sharing.model.UserGroupEntity;
-import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.registry.models.*;
+import org.apache.airavata.sharing.util.DBConstants;
 
 public class GroupMembershipRepository
         extends AbstractRepository<GroupMembership, GroupMembershipEntity, GroupMembershipPK> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java
index a55cc452f2..3a92a75dcf 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java
@@ -21,12 +21,12 @@ package org.apache.airavata.sharing.repository;
 
 import java.util.HashMap;
 import java.util.List;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.model.PermissionTypeEntity;
 import org.apache.airavata.sharing.model.PermissionTypePK;
-import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.registry.models.PermissionType;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
+import org.apache.airavata.sharing.util.DBConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java
index 0693146da9..8e171acd45 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java
@@ -25,10 +25,10 @@ import java.util.List;
 import java.util.Map;
 import org.apache.airavata.sharing.model.SharingEntity;
 import org.apache.airavata.sharing.model.SharingPK;
-import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.registry.models.Sharing;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.models.SharingType;
+import org.apache.airavata.sharing.util.DBConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java
index b63c7ff3a0..c7e3d6929c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java
@@ -27,11 +27,11 @@ import java.util.stream.Collectors;
 import org.apache.airavata.sharing.model.SharingEntity;
 import org.apache.airavata.sharing.model.UserGroupEntity;
 import org.apache.airavata.sharing.model.UserGroupPK;
-import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.registry.models.GroupCardinality;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.models.SharingType;
 import org.apache.airavata.sharing.registry.models.UserGroup;
+import org.apache.airavata.sharing.util.DBConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java
index 13c3ecf0f9..06bbc96089 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java
@@ -27,10 +27,10 @@ import java.util.stream.Collectors;
 import org.apache.airavata.sharing.model.SharingEntity;
 import org.apache.airavata.sharing.model.UserEntity;
 import org.apache.airavata.sharing.model.UserPK;
-import org.apache.airavata.sharing.util.DBConstants;
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.models.SharingType;
 import org.apache.airavata.sharing.registry.models.User;
+import org.apache.airavata.sharing.util.DBConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java b/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java
index 4ef41e266a..f640cc8156 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java
@@ -26,16 +26,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
+import org.apache.airavata.execution.service.RequestContext;
+import org.apache.airavata.execution.service.ServiceAuthorizationException;
+import org.apache.airavata.execution.service.ServiceException;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.model.group.ResourcePermissionType;
 import org.apache.airavata.model.group.ResourceType;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
-import org.apache.airavata.service.context.RequestContext;
-import org.apache.airavata.service.exception.ServiceAuthorizationException;
-import org.apache.airavata.service.exception.ServiceException;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.User;
 import org.apache.airavata.sharing.registry.models.UserGroup;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java b/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java
index 7f754afacf..ee4f945c83 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java
@@ -21,13 +21,13 @@ package org.apache.airavata.sharing.service;
 
 import java.util.Arrays;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.execution.handler.RegistryServerHandler;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
 import org.apache.airavata.model.group.ResourcePermissionType;
-import org.apache.airavata.registry.api.service.handler.RegistryServerHandler;
 import org.apache.airavata.security.service.GatewayGroupsInitializer;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.PermissionType;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.thrift.TException;
 
 public class SharingHelper {
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java
index cb3d5f8aa7..7f8851f001 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java
@@ -30,12 +30,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.apache.airavata.common.config.ServerSettings;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.util.AiravataUtils;
-import org.apache.airavata.common.config.ServerSettings;
-import org.apache.airavata.credential.util.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.credential.util.CredentialStoreClientFactory;
+import org.apache.airavata.execution.util.RegistryServiceClientFactory;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups;
@@ -55,15 +56,15 @@ import org.apache.airavata.model.security.AuthzToken;
 import org.apache.airavata.model.user.Status;
 import org.apache.airavata.model.user.UserProfile;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.security.util.AiravataSecurityException;
 import org.apache.airavata.security.profile.client.ProfileServiceClientFactory;
 import org.apache.airavata.security.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl;
-import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices;
-import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException;
 import org.apache.airavata.security.service.AiravataSecurityManager;
 import org.apache.airavata.security.service.SecurityManagerFactory;
+import org.apache.airavata.security.util.AiravataSecurityException;
+import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices;
+import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException;
+import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
 import org.apache.airavata.sharing.registry.models.Domain;
 import org.apache.airavata.sharing.registry.models.Entity;
 import org.apache.airavata.sharing.registry.models.EntitySearchField;
@@ -75,8 +76,6 @@ import org.apache.airavata.sharing.registry.models.SearchCondition;
 import org.apache.airavata.sharing.registry.models.SearchCriteria;
 import org.apache.airavata.sharing.registry.models.User;
 import org.apache.airavata.sharing.registry.models.UserGroup;
-import org.apache.airavata.sharing.handler.SharingRegistryServerHandler;
-import org.apache.airavata.sharing.util.ThriftDataModelConversion;
 import org.apache.thrift.TException;
 
 public class AiravataDataMigrator {
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java
index 334e6ab5bc..9b0837ec5b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java
@@ -22,8 +22,8 @@ package org.apache.airavata.sharing.util;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java
index 70a05cf5dc..4956d2393d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java
@@ -26,10 +26,21 @@ import org.apache.airavata.common.db.JDBCConfig;
 public class JPAUtils {
     public static final String PERSISTENCE_UNIT_NAME = "airavata-sharing-registry";
     private static final JDBCConfig JDBC_CONFIG = new SharingRegistryJDBCConfig();
-    private static final EntityManagerFactory factory =
-            org.apache.airavata.common.db.JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+    private static volatile EntityManagerFactory factory;
+
+    private static EntityManagerFactory getFactory() {
+        if (factory == null) {
+            synchronized (JPAUtils.class) {
+                if (factory == null) {
+                    factory = org.apache.airavata.common.db.JPAUtils.getEntityManagerFactory(
+                            PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
+                }
+            }
+        }
+        return factory;
+    }
 
     public static EntityManager getEntityManager() {
-        return factory.createEntityManager();
+        return getFactory().createEntityManager();
     }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java
index f0c0689378..35eb0259cd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java
@@ -19,9 +19,9 @@
 */
 package org.apache.airavata.sharing.util;
 
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.db.JDBCConfig;
 import org.apache.airavata.common.config.ServerSettings;
+import org.apache.airavata.common.db.JDBCConfig;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 
 public class SharingRegistryJDBCConfig implements JDBCConfig {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/model/DataMovementInterfaceEntity.java b/airavata-api/src/main/java/org/apache/airavata/storage/model/DataMovementInterfaceEntity.java
index 8a9f31900a..6a22b4896f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/model/DataMovementInterfaceEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/model/DataMovementInterfaceEntity.java
@@ -22,8 +22,8 @@ package org.apache.airavata.storage.model;
 import jakarta.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import org.apache.airavata.model.data.movement.DataMovementProtocol;
 import org.apache.airavata.compute.model.ComputeResourceEntity;
+import org.apache.airavata.model.data.movement.DataMovementProtocol;
 
 /**
  * The persistent class for the data_movement_interface database table.
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataMovementRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataMovementRepository.java
index af224ff536..28fae77e38 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataMovementRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataMovementRepository.java
@@ -20,11 +20,11 @@
 package org.apache.airavata.storage.repository;
 
 import com.github.dozermapper.core.Mapper;
-import org.apache.airavata.model.data.movement.DataMovementInterface;
 import org.apache.airavata.compute.repository.AppCatAbstractRepository;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.model.data.movement.DataMovementInterface;
 import org.apache.airavata.storage.model.DataMovementInterfaceEntity;
 import org.apache.airavata.storage.model.DataMovementInterfacePK;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
 
 public class DataMovementRepository
         extends AppCatAbstractRepository<DataMovementInterface, DataMovementInterfaceEntity, DataMovementInterfacePK> {
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataProductRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataProductRepository.java
index 222c402fa9..14ef4792d7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataProductRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataProductRepository.java
@@ -23,14 +23,14 @@ import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.time.Duration;
 import java.util.*;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.DataProductInterface;
+import org.apache.airavata.execution.util.cpi.ReplicaCatalogException;
 import org.apache.airavata.model.data.replica.DataProductModel;
 import org.apache.airavata.model.data.replica.DataProductType;
 import org.apache.airavata.storage.model.DataProductEntity;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.DataProductInterface;
-import org.apache.airavata.registry.cpi.ReplicaCatalogException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataReplicaLocationRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataReplicaLocationRepository.java
index a370fb7f56..3282ee1c1c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataReplicaLocationRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/DataReplicaLocationRepository.java
@@ -23,12 +23,12 @@ import com.github.dozermapper.core.Mapper;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.UUID;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.cpi.DataReplicaLocationInterface;
+import org.apache.airavata.execution.util.cpi.ReplicaCatalogException;
 import org.apache.airavata.model.data.replica.DataProductModel;
 import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
 import org.apache.airavata.storage.model.DataReplicaLocationEntity;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.cpi.DataReplicaLocationInterface;
-import org.apache.airavata.registry.cpi.ReplicaCatalogException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/RepCatAbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/RepCatAbstractRepository.java
index e6ecad5cc2..63218df14a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/RepCatAbstractRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/RepCatAbstractRepository.java
@@ -20,8 +20,8 @@
 package org.apache.airavata.storage.repository;
 
 import jakarta.persistence.EntityManager;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.apache.airavata.registry.core.utils.JPAUtil.RepCatalogJPAUtils;
+import org.apache.airavata.execution.util.AbstractRepository;
+import org.apache.airavata.execution.util.RepCatalogJPAUtils;
 
 public class RepCatAbstractRepository<T, E, Id> extends AbstractRepository<T, E, Id> {
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/StoragePrefRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/StoragePrefRepository.java
index e17357e02e..a2dd9c5e4a 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/StoragePrefRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/StoragePrefRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.storage.repository;
 
-import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
 import org.apache.airavata.compute.repository.AppCatAbstractRepository;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
 import org.apache.airavata.storage.model.StoragePreferenceEntity;
 import org.apache.airavata.storage.model.StoragePreferencePK;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/StorageResourceRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/StorageResourceRepository.java
index 525ad8eb1e..0dde9e14d3 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/StorageResourceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/StorageResourceRepository.java
@@ -20,22 +20,22 @@
 package org.apache.airavata.storage.repository;
 
 import com.github.dozermapper.core.Mapper;
-import org.apache.airavata.compute.repository.AppCatAbstractRepository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.airavata.compute.repository.AppCatAbstractRepository;
+import org.apache.airavata.execution.util.AppCatalogUtils;
+import org.apache.airavata.execution.util.DBConstants;
+import org.apache.airavata.execution.util.ObjectMapperSingleton;
+import org.apache.airavata.execution.util.QueryConstants;
+import org.apache.airavata.execution.util.cpi.AppCatalogException;
+import org.apache.airavata.execution.util.cpi.StorageResource;
 import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
 import org.apache.airavata.model.commons.airavata_commonsConstants;
 import org.apache.airavata.model.data.movement.DataMovementInterface;
 import org.apache.airavata.storage.model.StorageInterfaceEntity;
 import org.apache.airavata.storage.model.StorageInterfacePK;
 import org.apache.airavata.storage.model.StorageResourceEntity;
-import org.apache.airavata.registry.core.utils.AppCatalogUtils;
-import org.apache.airavata.registry.core.utils.DBConstants;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.apache.airavata.registry.core.utils.QueryConstants;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.StorageResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airavata-api/src/main/java/org/apache/airavata/storage/repository/UserStoragePreferenceRepository.java b/airavata-api/src/main/java/org/apache/airavata/storage/repository/UserStoragePreferenceRepository.java
index e67e0d710f..83a2a73baa 100644
--- a/airavata-api/src/main/java/org/apache/airavata/storage/repository/UserStoragePreferenceRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/storage/repository/UserStoragePreferenceRepository.java
@@ -19,8 +19,8 @@
 */
 package org.apache.airavata.storage.repository;
 
-import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference;
 import org.apache.airavata.compute.repository.AppCatAbstractRepository;
+import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference;
 import org.apache.airavata.storage.model.UserStoragePreferenceEntity;
 import org.apache.airavata.storage.model.UserStoragePreferencePK;
... 7163 lines suppressed ...