diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java
index b9cc502f9..ee3469bd0 100644
--- a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java
+++ b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java
@@ -58,13 +58,9 @@ public AnomalyDetectorExtension() {
     public List<ExtensionRestHandler> getExtensionRestHandlers() {
         return List
             .of(
-                new RestIndexAnomalyDetectorAction(extensionsRunner, this),
-                // FIXME delete this
-                // new RestCreateDetectorAction(extensionsRunner, this),
-                new RestValidateAnomalyDetectorAction(extensionsRunner, this),
+                new RestIndexAnomalyDetectorAction(extensionsRunner(), this),
+                new RestValidateAnomalyDetectorAction(extensionsRunner(), this),
                 new RestGetDetectorAction()
-                // FIXME delete this
-                // new RestValidateDetectorAction(extensionsRunner, this)
             );
     }
 
@@ -142,7 +138,7 @@ public SDKRestClient getRestClient() {
     }
 
     @Override
-    public Map<String, Class<? extends TransportAction<? extends ActionRequest, ? extends ActionResponse>>> getActions() {
+    public Map<String, Class<? extends TransportAction<? extends ActionRequest, ? extends ActionResponse>>> getActionsMap() {
         Map<String, Class<? extends TransportAction<? extends ActionRequest, ? extends ActionResponse>>> map = new HashMap<>();
         map.put(ADJobParameterAction.NAME, ADJobParameterTransportAction.class);
         map.put(ADJobRunnerAction.NAME, ADJobRunnerTransportAction.class);
diff --git a/src/main/java/org/opensearch/ad/transport/ADJobParameterTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADJobParameterTransportAction.java
index d2100aee9..4ab0d727c 100644
--- a/src/main/java/org/opensearch/ad/transport/ADJobParameterTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADJobParameterTransportAction.java
@@ -18,9 +18,9 @@
 import org.opensearch.extensions.action.ExtensionActionResponse;
 import org.opensearch.jobscheduler.model.ExtensionJobParameter;
 import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionResponse;
-import org.opensearch.jobscheduler.transport.JobParameterRequest;
-import org.opensearch.jobscheduler.transport.JobParameterResponse;
+import org.opensearch.jobscheduler.transport.request.JobParameterRequest;
+import org.opensearch.jobscheduler.transport.response.ExtensionJobActionResponse;
+import org.opensearch.jobscheduler.transport.response.JobParameterResponse;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/main/java/org/opensearch/ad/transport/ADJobRunnerTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADJobRunnerTransportAction.java
index 382185725..7e37faea0 100644
--- a/src/main/java/org/opensearch/ad/transport/ADJobRunnerTransportAction.java
+++ b/src/main/java/org/opensearch/ad/transport/ADJobRunnerTransportAction.java
@@ -25,9 +25,9 @@
 import org.opensearch.extensions.action.ExtensionActionRequest;
 import org.opensearch.extensions.action.ExtensionActionResponse;
 import org.opensearch.jobscheduler.spi.JobExecutionContext;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionResponse;
-import org.opensearch.jobscheduler.transport.JobRunnerRequest;
-import org.opensearch.jobscheduler.transport.JobRunnerResponse;
+import org.opensearch.jobscheduler.transport.request.JobRunnerRequest;
+import org.opensearch.jobscheduler.transport.response.ExtensionJobActionResponse;
+import org.opensearch.jobscheduler.transport.response.JobRunnerResponse;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClient.SDKRestClient;
 import org.opensearch.tasks.Task;
diff --git a/src/test/java/org/opensearch/ad/transport/ADJobParameterActionTests.java b/src/test/java/org/opensearch/ad/transport/ADJobParameterActionTests.java
index e2266c0e0..f9f98f0c7 100644
--- a/src/test/java/org/opensearch/ad/transport/ADJobParameterActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADJobParameterActionTests.java
@@ -15,10 +15,10 @@
 import org.opensearch.jobscheduler.model.ExtensionJobParameter;
 import org.opensearch.jobscheduler.spi.JobDocVersion;
 import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionRequest;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionResponse;
-import org.opensearch.jobscheduler.transport.JobParameterRequest;
-import org.opensearch.jobscheduler.transport.JobParameterResponse;
+import org.opensearch.jobscheduler.transport.request.ExtensionJobActionRequest;
+import org.opensearch.jobscheduler.transport.request.JobParameterRequest;
+import org.opensearch.jobscheduler.transport.response.ExtensionJobActionResponse;
+import org.opensearch.jobscheduler.transport.response.JobParameterResponse;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 
 public class ADJobParameterActionTests extends OpenSearchSingleNodeTestCase {
diff --git a/src/test/java/org/opensearch/ad/transport/ADJobParameterTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADJobParameterTransportActionTests.java
index fc7c67173..2ddd460f2 100644
--- a/src/test/java/org/opensearch/ad/transport/ADJobParameterTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADJobParameterTransportActionTests.java
@@ -21,9 +21,9 @@
 import org.opensearch.extensions.action.ExtensionActionRequest;
 import org.opensearch.extensions.action.ExtensionActionResponse;
 import org.opensearch.jobscheduler.spi.JobDocVersion;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionRequest;
-import org.opensearch.jobscheduler.transport.JobParameterRequest;
-import org.opensearch.jobscheduler.transport.JobParameterResponse;
+import org.opensearch.jobscheduler.transport.request.ExtensionJobActionRequest;
+import org.opensearch.jobscheduler.transport.request.JobParameterRequest;
+import org.opensearch.jobscheduler.transport.response.JobParameterResponse;
 import org.opensearch.tasks.Task;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.transport.TransportService;
diff --git a/src/test/java/org/opensearch/ad/transport/ADJobRunnerActionTests.java b/src/test/java/org/opensearch/ad/transport/ADJobRunnerActionTests.java
index 3ae0247c1..0d35de91b 100644
--- a/src/test/java/org/opensearch/ad/transport/ADJobRunnerActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADJobRunnerActionTests.java
@@ -18,7 +18,10 @@
 import org.opensearch.jobscheduler.spi.JobDocVersion;
 import org.opensearch.jobscheduler.spi.JobExecutionContext;
 import org.opensearch.jobscheduler.spi.utils.LockService;
-import org.opensearch.jobscheduler.transport.*;
+import org.opensearch.jobscheduler.transport.request.ExtensionJobActionRequest;
+import org.opensearch.jobscheduler.transport.request.JobRunnerRequest;
+import org.opensearch.jobscheduler.transport.response.ExtensionJobActionResponse;
+import org.opensearch.jobscheduler.transport.response.JobRunnerResponse;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 
 public class ADJobRunnerActionTests extends OpenSearchSingleNodeTestCase {
diff --git a/src/test/java/org/opensearch/ad/transport/ADJobRunnerTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADJobRunnerTransportActionTests.java
index ece7820b5..d9f0bd2ea 100644
--- a/src/test/java/org/opensearch/ad/transport/ADJobRunnerTransportActionTests.java
+++ b/src/test/java/org/opensearch/ad/transport/ADJobRunnerTransportActionTests.java
@@ -18,9 +18,9 @@
 import org.opensearch.jobscheduler.spi.JobDocVersion;
 import org.opensearch.jobscheduler.spi.JobExecutionContext;
 import org.opensearch.jobscheduler.spi.utils.LockService;
-import org.opensearch.jobscheduler.transport.ExtensionJobActionRequest;
-import org.opensearch.jobscheduler.transport.JobRunnerRequest;
-import org.opensearch.jobscheduler.transport.JobRunnerResponse;
+import org.opensearch.jobscheduler.transport.request.ExtensionJobActionRequest;
+import org.opensearch.jobscheduler.transport.request.JobRunnerRequest;
+import org.opensearch.jobscheduler.transport.response.JobRunnerResponse;
 import org.opensearch.sdk.ExtensionNamedXContentRegistry;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClient.SDKRestClient;