diff --git a/src/main/java/org/opensearch/sdk/NettyTransport.java b/src/main/java/org/opensearch/sdk/NettyTransport.java
index a19f2108..98e81f7e 100644
--- a/src/main/java/org/opensearch/sdk/NettyTransport.java
+++ b/src/main/java/org/opensearch/sdk/NettyTransport.java
@@ -17,8 +17,8 @@
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.PageCacheRecycler;
-import org.opensearch.indices.breaker.CircuitBreakerService;
-import org.opensearch.indices.breaker.NoneCircuitBreakerService;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
+import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
 import org.opensearch.sdk.ssl.DefaultSslKeyStore;
 import org.opensearch.sdk.ssl.SSLConfigConstants;
 import org.opensearch.sdk.ssl.SSLNettyTransport;
diff --git a/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java b/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java
index 9bd2c8d6..3fdc944c 100644
--- a/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java
+++ b/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java
@@ -9,10 +9,10 @@
 
 package org.opensearch.sdk.api;
 
-import org.opensearch.common.breaker.CircuitBreaker;
+import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.indices.breaker.BreakerSettings;
-import org.opensearch.indices.breaker.CircuitBreakerService;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.sdk.Extension;
 
 /**
diff --git a/src/main/java/org/opensearch/sdk/handlers/UpdateSettingsRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/UpdateSettingsRequestHandler.java
index e7f72211..af2340c6 100644
--- a/src/main/java/org/opensearch/sdk/handlers/UpdateSettingsRequestHandler.java
+++ b/src/main/java/org/opensearch/sdk/handlers/UpdateSettingsRequestHandler.java
@@ -18,7 +18,7 @@
 import org.opensearch.Version;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.WriteableSetting;
-import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.extensions.AcknowledgedResponse;
 import org.opensearch.extensions.UpdateSettingsRequest;
diff --git a/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java b/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java
index 38593d0f..ffa3074c 100644
--- a/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java
+++ b/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java
@@ -32,7 +32,7 @@
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.PageCacheRecycler;
-import org.opensearch.indices.breaker.CircuitBreakerService;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.SharedGroupFactory;
 import org.opensearch.transport.TcpChannel;
diff --git a/src/test/java/org/opensearch/sdk/TestExtensionInterfaces.java b/src/test/java/org/opensearch/sdk/TestExtensionInterfaces.java
index c0c8da3f..3cc8a8d7 100644
--- a/src/test/java/org/opensearch/sdk/TestExtensionInterfaces.java
+++ b/src/test/java/org/opensearch/sdk/TestExtensionInterfaces.java
@@ -16,7 +16,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.opensearch.common.breaker.CircuitBreaker;
+import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.mapper.Mapper;
 import org.opensearch.index.mapper.MetadataFieldMapper;
diff --git a/src/test/java/org/opensearch/sdk/TestNetty4Transport.java b/src/test/java/org/opensearch/sdk/TestNetty4Transport.java
index ed9ce102..a9864371 100644
--- a/src/test/java/org/opensearch/sdk/TestNetty4Transport.java
+++ b/src/test/java/org/opensearch/sdk/TestNetty4Transport.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.opensearch.common.component.Lifecycle;
+import org.opensearch.common.lifecycle.Lifecycle;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;