diff --git a/src/main/java/org/opensearch/geospatial/GeospatialParser.java b/src/main/java/org/opensearch/geospatial/GeospatialParser.java
index d0d791d0..04c81efd 100644
--- a/src/main/java/org/opensearch/geospatial/GeospatialParser.java
+++ b/src/main/java/org/opensearch/geospatial/GeospatialParser.java
@@ -13,9 +13,9 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.geospatial.geojson.Feature;
 import org.opensearch.geospatial.geojson.FeatureCollection;
 
diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java
index 09136850..4a485983 100644
--- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java
+++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java
@@ -18,9 +18,9 @@
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.UUIDs;
-import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geospatial.processor.FeatureProcessor;
 import org.opensearch.ingest.Pipeline;
diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java
index 8bc8df5c..fc05a2ae 100644
--- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java
+++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequest.java
@@ -20,9 +20,9 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.rest.RestRequest;
 
 @AllArgsConstructor
diff --git a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java
index 68707531..f1cd8616 100644
--- a/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java
+++ b/src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONResponse.java
@@ -13,8 +13,8 @@
 import org.opensearch.action.ActionResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.bulk.BulkResponse;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java b/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java
index 433b361d..f1221a4a 100644
--- a/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java
+++ b/src/main/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilder.java
@@ -13,7 +13,7 @@
 import org.apache.lucene.search.ConstantScoreQuery;
 import org.apache.lucene.search.Query;
 import org.opensearch.common.geo.parsers.ShapeParser;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geometry.Geometry;
diff --git a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java
index 1d2ab65c..085bbf92 100644
--- a/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java
+++ b/src/main/java/org/opensearch/geospatial/plugin/GeospatialPlugin.java
@@ -17,11 +17,11 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.collect.MapBuilder;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
diff --git a/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java b/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java
index 5f211e31..4e4034d0 100644
--- a/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java
+++ b/src/main/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONAction.java
@@ -13,9 +13,9 @@
 import java.util.List;
 
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONAction;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequest;
 import org.opensearch.rest.BaseRestHandler;
diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java
index 9b336f86..6199d016 100644
--- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java
+++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGrid.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGrid;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGridBucket;
 import org.opensearch.search.aggregations.InternalAggregations;
diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java
index 0a640cf6..018be48e 100644
--- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java
+++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridAggregationBuilder.java
@@ -12,8 +12,8 @@
 
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.common.geo.GeoBoundingBox;
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.xcontent.support.XContentMapValues;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder;
diff --git a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java
index 29c5b80a..40c7bdc9 100644
--- a/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java
+++ b/src/main/java/org/opensearch/geospatial/search/aggregations/bucket/geogrid/GeoHexGridBucket.java
@@ -9,7 +9,7 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.BaseGeoGridBucket;
 import org.opensearch.geospatial.h3.H3;
 import org.opensearch.search.aggregations.InternalAggregations;
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java
index 2dacef52..9f8b8e58 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadMetric.java
@@ -11,10 +11,10 @@
 
 import lombok.Getter;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java
index cd4224e9..c2afd22b 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStats.java
@@ -12,10 +12,10 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.metrics.CounterMetric;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java
index 47abf9ef..e18f6195 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeRequest.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.transport.TransportRequest;
 
 public class UploadStatsNodeRequest extends TransportRequest {
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java
index 8b6907d7..3baa29a1 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponse.java
@@ -10,8 +10,8 @@
 
 import org.opensearch.action.support.nodes.BaseNodeResponse;
 import org.opensearch.cluster.node.DiscoveryNode;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java
index 9bcacc99..5c3efa9d 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsRequest.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 import org.opensearch.action.support.nodes.BaseNodesRequest;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class UploadStatsRequest extends BaseNodesRequest<UploadStatsRequest> {
 
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java
index a8b9b674..c8f0fe76 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsResponse.java
@@ -14,9 +14,9 @@
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.support.nodes.BaseNodesResponse;
 import org.opensearch.cluster.ClusterName;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java
index 5caa3ac0..869eecb4 100644
--- a/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java
+++ b/src/main/java/org/opensearch/geospatial/stats/upload/UploadStatsTransportAction.java
@@ -13,7 +13,7 @@
 import org.opensearch.action.support.nodes.TransportNodesAction;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java b/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java
index 71c86382..d7de97b9 100644
--- a/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java
+++ b/src/test/java/org/opensearch/geospatial/GeospatialParserTests.java
@@ -12,7 +12,7 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.opensearch.common.bytes.BytesArray;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.geospatial.geojson.Feature;
 import org.opensearch.test.OpenSearchTestCase;
 
diff --git a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java
index e787fc7e..1e5c1439 100644
--- a/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java
+++ b/src/test/java/org/opensearch/geospatial/GeospatialRestTestCase.java
@@ -41,6 +41,7 @@
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geometry.Geometry;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent;
@@ -49,7 +50,6 @@
 import org.opensearch.geospatial.processor.FeatureProcessor;
 import org.opensearch.geospatial.rest.action.upload.geojson.RestUploadGeoJSONAction;
 import org.opensearch.ingest.Pipeline;
-import org.opensearch.rest.RestStatus;
 
 public abstract class GeospatialRestTestCase extends OpenSearchSecureRestTestCase {
 
diff --git a/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java b/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java
index bc3d28a6..9f455a1e 100644
--- a/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java
+++ b/src/test/java/org/opensearch/geospatial/GeospatialTestHelper.java
@@ -39,11 +39,11 @@
 import org.opensearch.common.Randomness;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.collect.Tuple;
+import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.geospatial.action.upload.geojson.ContentBuilder;
 import org.opensearch.geospatial.action.upload.geojson.UploadGeoJSONRequestContent;
 import org.opensearch.geospatial.h3.H3;
 import org.opensearch.geospatial.stats.upload.UploadMetric;
-import org.opensearch.index.shard.ShardId;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.RandomObjects;
 
diff --git a/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java b/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java
index d973192a..0a591f2c 100644
--- a/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java
+++ b/src/test/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONRequestTests.java
@@ -13,9 +13,9 @@
 import java.nio.charset.StandardCharsets;
 
 import org.json.JSONObject;
-import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.test.OpenSearchTestCase;
 
diff --git a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java
index 6f322e9f..b7d8c97e 100644
--- a/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java
+++ b/src/test/java/org/opensearch/geospatial/index/mapper/xypoint/XYPointParserTests.java
@@ -10,8 +10,8 @@
 import java.io.IOException;
 
 import org.opensearch.OpenSearchParseException;
-import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.OpenSearchTestCase;
diff --git a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java
index e128f797..60103866 100644
--- a/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java
+++ b/src/test/java/org/opensearch/geospatial/index/query/xyshape/XYShapeQueryBuilderTests.java
@@ -28,12 +28,12 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.common.Strings;
-import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.geo.GeoJson;
 import org.opensearch.common.geo.ShapeRelation;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geometry.Geometry;
diff --git a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java
index daf9b913..e28372dc 100644
--- a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java
+++ b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginIT.java
@@ -8,8 +8,8 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.geospatial.GeospatialRestTestCase;
-import org.opensearch.rest.RestStatus;
 
 public class GeospatialPluginIT extends GeospatialRestTestCase {
 
diff --git a/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java b/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java
index 8e256aae..585f8628 100644
--- a/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java
+++ b/src/test/java/org/opensearch/geospatial/processor/FeatureProcessorIT.java
@@ -21,8 +21,8 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.geospatial.GeospatialRestTestCase;
-import org.opensearch.rest.RestStatus;
 
 public class FeatureProcessorIT extends GeospatialRestTestCase {
 
diff --git a/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java b/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java
index 53d12c84..167536e8 100644
--- a/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java
+++ b/src/test/java/org/opensearch/geospatial/rest/action/upload/geojson/RestUploadGeoJSONActionIT.java
@@ -21,8 +21,8 @@
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.geospatial.GeospatialRestTestCase;
-import org.opensearch.rest.RestStatus;
 
 public class RestUploadGeoJSONActionIT extends GeospatialRestTestCase {
 
diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java b/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java
index 303e7ccf..86d4168e 100644
--- a/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java
+++ b/src/test/java/org/opensearch/geospatial/stats/upload/RestUploadStatsActionIT.java
@@ -12,8 +12,8 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.geospatial.GeospatialRestTestCase;
-import org.opensearch.rest.RestStatus;
 
 public class RestUploadStatsActionIT extends GeospatialRestTestCase {
 
diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java
index 4a6599f7..c69ca8e3 100644
--- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java
+++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadMetricTests.java
@@ -13,8 +13,8 @@
 
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.geospatial.GeospatialTestHelper;
 import org.opensearch.test.OpenSearchTestCase;
 
diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java
index e453f03b..76b9587e 100644
--- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java
+++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsNodeResponseTests.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.geospatial.GeospatialTestHelper;
 import org.opensearch.test.OpenSearchTestCase;
 
diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java
index ab22bc5d..e6fec0aa 100644
--- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java
+++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsResponseTests.java
@@ -20,8 +20,8 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
diff --git a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java
index baa4ff77..4177d5e4 100644
--- a/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java
+++ b/src/test/java/org/opensearch/geospatial/stats/upload/UploadStatsTests.java
@@ -15,8 +15,8 @@
 
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geospatial.GeospatialTestHelper;