diff --git a/build.gradle b/build.gradle
index 3937d2bc4..f3ed9a2cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ plugins {
 }
 
 application {
-    mainClassName = 'com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp'
+    mainClassName = 'org.opensearch.performanceanalyzer.PerformanceAnalyzerApp'
     applicationDefaultJvmArgs = ['-Xms64M',
                                  '-Xmx64M',
                                  '-XX:+UseSerialGC',
@@ -173,12 +173,12 @@ jacocoTestReport {
         classDirectories.from = files(classDirectories.files.collect {
             fileTree(dir: it,
                     include: [
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/**'
+                            '**/org/opensearch/performanceanalyzer/**'
                     ],
                     exclude: [
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/grpc/**',
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/**',
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/requests**'
+                            '**/org/opensearch/performanceanalyzer/grpc/**',
+                            '**/org/opensearch/performanceanalyzer/rca/framework/api/metrics/**',
+                            '**/org/opensearch/performanceanalyzer/rca/net/requests**'
                     ])
         })
     }
@@ -189,11 +189,11 @@ jacocoTestCoverageVerification {
         classDirectories.from = files(classDirectories.files.collect {
             fileTree(dir: it,
                     include: [
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/**',
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/reader/**'
+                            '**/org/opensearch/performanceanalyzer/rca/**',
+                            '**/org/opensearch/performanceanalyzer/reader/**'
                     ],
                     exclude: [
-                            '**/com/amazon/opendistro/opensearch/performanceanalyzer/grpc/**'])
+                            '**/org/opensearch/performanceanalyzer/grpc/**'])
         })
     }
     violationRules {
@@ -217,9 +217,9 @@ if (isSnapshot) {
 test {
     filter { // Ignore failing tests
         // Test testMissingHeapMetrics failed
-        excludeTestsMatching 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.HeapSizeIncreaseMissingMetricsTest'
+        excludeTestsMatching 'org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.HeapSizeIncreaseMissingMetricsTest'
         // Test testJvmActions failed
-        excludeTestsMatching 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest'
+        excludeTestsMatching 'org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest'
     }
     enabled = true
     retry {
@@ -229,7 +229,7 @@ test {
 
 task rcaTest(type: Test) {
     useJUnit {
-        includeCategories 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca'
+        includeCategories 'org.opensearch.performanceanalyzer.rca.GradleTaskForRca'
     }
     testLogging.showStandardStreams = true
 }
@@ -237,7 +237,7 @@ task rcaTest(type: Test) {
 task rcaIt(type: Test) {
     dependsOn spotbugsMain
     useJUnit {
-        includeCategories 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker'
+        includeCategories 'org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker'
     }
     //testLogging.showStandardStreams = true
 }
diff --git a/checkstyle/findbugs-exclude.xml b/checkstyle/findbugs-exclude.xml
index 276cb5c63..42ae6562c 100644
--- a/checkstyle/findbugs-exclude.xml
+++ b/checkstyle/findbugs-exclude.xml
@@ -3,88 +3,88 @@
         <Bug pattern="DM_DEFAULT_ENCODING"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.Disks"/>
+        <Class name="org.opensearch.performanceanalyzer.hwnet.Disks"/>
         <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor"/>
+        <Class name="org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor"/>
         <Bug pattern="MS_CANNOT_BE_FINAL"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
+        <Class name="org.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
         <Bug pattern="LI_LAZY_INIT_STATIC"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
+        <Class name="org.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
         <Bug pattern="REC_CATCH_EXCEPTION"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
+        <Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
         <Bug pattern="LI_LAZY_INIT_STATIC"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
+        <Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
         <Bug pattern="MS_CANNOT_BE_FINAL"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
+        <Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
         <Bug pattern="MS_SHOULD_BE_FINAL"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
+        <Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
         <Bug pattern="REC_CATCH_EXCEPTION"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
+        <Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
         <Bug pattern="DC_DOUBLECHECK"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator"/>
+        <Class name="org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator"/>
         <Bug pattern="EI_EXPOSE_REP2"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.jvm.ThreadList"/>
+        <Class name="org.opensearch.performanceanalyzer.jvm.ThreadList"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler"/>
+        <Class name="org.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler"/>
+        <Class name="org.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler"/>
+        <Class name="org.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler"/>
+        <Class name="org.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB"/>
+        <Class name="org.opensearch.performanceanalyzer.metricsdb.MetricsDB"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration"/>
+        <Class name="org.opensearch.performanceanalyzer.metrics.MetricsConfiguration"/>
         <Bug pattern="MS_MUTABLE_COLLECTION"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.FileRotate"/>
+        <Class name="org.opensearch.performanceanalyzer.rca.persistence.FileRotate"/>
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler"/>
+        <Class name="org.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
     <Match>
-        <Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader.AdmissionControlProcessor"/>
+        <Class name="org.opensearch.performanceanalyzer.reader.AdmissionControlProcessor"/>
         <Bug pattern="URF_UNREAD_FIELD"/>
     </Match>
     <!--Exclude gRPC generated classes-->
     <Match>
-        <Package name="com.amazon.opendistro.opensearch.performanceanalyzer.grpc"/>
+        <Package name="org.opensearch.performanceanalyzer.grpc"/>
         <Or>
             <Bug pattern="SE_BAD_FIELD"/>
             <Bug pattern="UCF_USELESS_CONTROL_FLOW"/>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cab4f8b80..d60e35016 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -77,8 +77,8 @@ RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/
 RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent
 RUN chmod -R 755 /dev/shm
 ################################################################################
-# Build stage 1 (the actual opendistroforelasticsearch image):
-# Copy opendistroforelasticsearch from stage 0
+# Build stage 1 (the actual OpenSearch image):
+# Copy OpenSearch from stage 0
 # Add entrypoint
 ################################################################################
 
@@ -143,10 +143,10 @@ RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/sha
 EXPOSE 9200 9300 9600 9650
 
 LABEL org.label-schema.schema-version="1.0" \
-  org.label-schema.name="opendistroforelasticsearch" \
+  org.label-schema.name="opensearch" \
   org.label-schema.version="1.2.0" \
   org.label-schema.url="https://opendistro.github.io" \
-  org.label-schema.vcs-url="https://github.com/opendistro-for-elasticsearch/opendistro-build" \
+  org.label-schema.vcs-url="https://github.com/opensearch-project/opensearch-build" \
   org.label-schema.license="Apache-2.0" \
   org.label-schema.vendor="Amazon" \
   org.label-schema.build-date="19.12.13"
diff --git a/docs/gauntlet.md b/docs/gauntlet.md
index 3f12f9a39..54e04bc69 100644
--- a/docs/gauntlet.md
+++ b/docs/gauntlet.md
@@ -81,7 +81,7 @@ Let's see an example:
 ```
 
 - _name_ : The Metric graph node that will be emitting these values. The expected parameter is one of the metrics classes
- in `com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics`. The
+ in `org.opensearch.performanceanalyzer.rca.framework.api.metrics`. The
  metrics class that you specify, should have a `static final` field called `NAME` (`CPU_Utilization`)
  and that will be used to determine the name of the metric table.
 - _dimensionNames_ : For the dimension names for a metric, please refer to the docs 
@@ -169,7 +169,7 @@ Host IDs | Host Tags
 ### Examples
 
 Some of the examples for how to write the integ tests can be found here:
-`src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/*`
+`src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/*`
 
 ### Running the integ tests
 1. All integration tests written using this framework can be run by using the command
diff --git a/pa_config/rca.conf b/pa_config/rca.conf
index 49ddef507..3f615cf2a 100644
--- a/pa_config/rca.conf
+++ b/pa_config/rca.conf
@@ -1,5 +1,5 @@
 {
-  "analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
+  "analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/pa_config/rca_idle_master.conf b/pa_config/rca_idle_master.conf
index def072ce1..0ef95b054 100644
--- a/pa_config/rca_idle_master.conf
+++ b/pa_config/rca_idle_master.conf
@@ -1,5 +1,5 @@
 {
-  "analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
+  "analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/pa_config/rca_master.conf b/pa_config/rca_master.conf
index e1a736965..9240d99a6 100644
--- a/pa_config/rca_master.conf
+++ b/pa_config/rca_master.conf
@@ -1,5 +1,5 @@
 {
-  "analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
+  "analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/AppContext.java b/src/main/java/org/opensearch/performanceanalyzer/AppContext.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/AppContext.java
rename to src/main/java/org/opensearch/performanceanalyzer/AppContext.java
index aa1c1aff8..eb6b2c670 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/AppContext.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/AppContext.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -38,6 +34,10 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 /**
  * The PA agent process is composed of multiple components. The PA Reader and RCA are two such
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/CertificateUtils.java b/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/CertificateUtils.java
rename to src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java
index 35a4a8fae..e4b3dcb43 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/CertificateUtils.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
 import java.io.File;
 import java.io.FileReader;
 import java.security.KeyStore;
@@ -45,6 +44,7 @@
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMParser;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
 
 public class CertificateUtils {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ClientServers.java b/src/main/java/org/opensearch/performanceanalyzer/ClientServers.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ClientServers.java
rename to src/main/java/org/opensearch/performanceanalyzer/ClientServers.java
index fa5c763e6..ec773c7d5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ClientServers.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/ClientServers.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetServer;
 import com.sun.net.httpserver.HttpServer;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.net.NetServer;
 
 /** A wrapper class to return all the server created by the App. */
 public class ClientServers {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ConfigStatus.java b/src/main/java/org/opensearch/performanceanalyzer/ConfigStatus.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ConfigStatus.java
rename to src/main/java/org/opensearch/performanceanalyzer/ConfigStatus.java
index 952215932..bd93a95fb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/ConfigStatus.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/ConfigStatus.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 public final class ConfigStatus {
     private boolean configMissingOrIncorrect = false;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/DBUtils.java b/src/main/java/org/opensearch/performanceanalyzer/DBUtils.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/DBUtils.java
rename to src/main/java/org/opensearch/performanceanalyzer/DBUtils.java
index e2634561e..7da7195ea 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/DBUtils.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/DBUtils.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
 import java.util.Collection;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java b/src/main/java/org/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
rename to src/main/java/org/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
index c13b5e9da..85105d81e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxOSMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxOSMetricsGenerator;
 
 public class OSMetricsGeneratorFactory {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
rename to src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
index 9aa5a4e9d..8dcc2fa51 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
@@ -24,47 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.TroubleshootingConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetServer;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.sys.AllJvmSamplers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.listener.MisbehavingGraphOperateMethodListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers.BatchMetricsEnabledSampler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers.RcaStateSamplers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.RcaStatsReporter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
+package org.opensearch.performanceanalyzer;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.sun.net.httpserver.HttpServer;
@@ -78,6 +40,44 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.config.TroubleshootingConfig;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.net.NetServer;
+import org.opensearch.performanceanalyzer.rca.RcaController;
+import org.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.sys.AllJvmSamplers;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.listener.MisbehavingGraphOperateMethodListener;
+import org.opensearch.performanceanalyzer.rca.samplers.BatchMetricsEnabledSampler;
+import org.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler;
+import org.opensearch.performanceanalyzer.rca.samplers.RcaStateSamplers;
+import org.opensearch.performanceanalyzer.rca.stats.RcaStatsReporter;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
+import org.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
+import org.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler;
+import org.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
+import org.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
 
 public class PerformanceAnalyzerApp {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
rename to src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
index c859037b7..89447f667 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
 
 /**
  * Enum of threads that are spawned by Performance Analyzer agent. Each enum value encapsulates two
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
similarity index 99%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
rename to src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
index 650ebc7ce..f88c9601b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSet.java b/src/main/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
rename to src/main/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
index f24d1330d..a39164f2a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collections;
+package org.opensearch.performanceanalyzer.collections;
 
 
 import com.google.common.cache.Cache;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/CachedStats.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CachedStats.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/CachedStats.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/CachedStats.java
index 4e2a8a56c..be6de6504 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/CachedStats.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/CachedStats.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
 
 class CachedStats {
     private static final Set<String> CACHABLE_VALUES =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DiskMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/DiskMetrics.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DiskMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/DiskMetrics.java
index d2fd37655..6c4252d62 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DiskMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/DiskMetrics.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
 
 public class DiskMetrics extends MetricStatus {
     public String name;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/DisksCollector.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/DisksCollector.java
index 12693b7c8..aaff3800d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/DisksCollector.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 
 public class DisksCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
index cd2b9b248..b8e8eeb4e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.GarbageCollectorInfo;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.GCInfoDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 import java.util.function.Supplier;
+import org.opensearch.performanceanalyzer.jvm.GarbageCollectorInfo;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.GCInfoDimension;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 /**
  * A collector that collects info about the current garbage collectors for various regions in the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
index 407232798..e2fbaabbc 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.GCMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.HeapMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.GCType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import java.lang.management.MemoryUsage;
@@ -42,6 +34,14 @@
 import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.jvm.GCMetrics;
+import org.opensearch.performanceanalyzer.jvm.HeapMetrics;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.GCType;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 public class HeapMetricsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricStatus.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/MetricStatus.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricStatus.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/MetricStatus.java
index 24671152f..3b689cf4c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricStatus.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/MetricStatus.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class MetricStatus {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java
index 498f69457..dfb003cc3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/MetricsPurgeActivity.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import java.io.File;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 public class MetricsPurgeActivity extends PerformanceAnalyzerMetricsCollector {
     private static final Logger LOG = LogManager.getLogger(MetricsPurgeActivity.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java
index 0f652a3e5..0799b8764 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetrics.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionValue;
 
 public class MountedPartitionMetrics extends MetricStatus {
     private String mountPoint;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java
index 1613a99e9..c719290d4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollector.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 
 public class MountedPartitionMetricsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java
index e2230ba46..20c95bab7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetInterfaceSummary.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
 
 // all metrics are per-time-unit
 public class NetInterfaceSummary extends MetricStatus {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java
index 2c695a515..8e4c47238 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollector.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
 
 public class NetworkE2ECollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
index 870c86b5b..fdee2017a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 
 public class NetworkInterfaceCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
index 4c370426e..3ac7db6c8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.ThreadList;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.OSMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
+package org.opensearch.performanceanalyzer.collectors;
+
+
 import java.util.Map;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.jvm.ThreadList;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.OSMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
 
 public class OSMetricsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java
index e5b8199d9..9048a26b7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/PerformanceAnalyzerMetricsCollector.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.core.Util;
 
 public abstract class PerformanceAnalyzerMetricsCollector implements Runnable {
     enum State {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
index d02715a87..2084d4d12 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatExceptionCode.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/StatExceptionCode.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatExceptionCode.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/StatExceptionCode.java
index fa14be5d9..858cee7b0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatExceptionCode.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/StatExceptionCode.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 public enum StatExceptionCode {
     TOTAL_ERROR("TotalError"),
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/StatsCollector.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatsCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/StatsCollector.java
index 45bcd99e0..007a8dcc2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/StatsCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/StatsCollector.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.Version;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.formatter.StatsCollectorFormatter;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -47,6 +41,12 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.rca.Version;
+import org.opensearch.performanceanalyzer.rca.formatter.StatsCollectorFormatter;
 
 public class StatsCollector extends PerformanceAnalyzerMetricsCollector {
     private static final String LOG_ENTRY_INIT =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/TCPStatus.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/TCPStatus.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/TCPStatus.java
rename to src/main/java/org/opensearch/performanceanalyzer/collectors/TCPStatus.java
index 21daa1233..3c3311f22 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/TCPStatus.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/TCPStatus.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
 
 public class TCPStatus extends MetricStatus {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFatalException.java b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFatalException.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFatalException.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/ConfigFatalException.java
index f23d6ac5e..cffd29802 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFatalException.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFatalException.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config;
+package org.opensearch.performanceanalyzer.config;
 
 class ConfigFatalException extends Exception {
     ConfigFatalException(String message) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFileException.java b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFileException.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFileException.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/ConfigFileException.java
index 24befde0f..76dba49e8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/ConfigFileException.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFileException.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config;
+package org.opensearch.performanceanalyzer.config;
 
 class ConfigFileException extends Exception {
     ConfigFileException(Throwable cause) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/PluginSettings.java b/src/main/java/org/opensearch/performanceanalyzer/config/PluginSettings.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/PluginSettings.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/PluginSettings.java
index a076ae817..c3b292cc7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/PluginSettings.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/PluginSettings.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config;
+package org.opensearch.performanceanalyzer.config;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.ConfigStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.util.Properties;
@@ -37,6 +35,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.ConfigStatus;
+import org.opensearch.performanceanalyzer.core.Util;
 
 public class PluginSettings {
     private static final Logger LOG = LogManager.getLogger(PluginSettings.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/SettingsHelper.java b/src/main/java/org/opensearch/performanceanalyzer/config/SettingsHelper.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/SettingsHelper.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/SettingsHelper.java
index 228091d17..bd43d387f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/SettingsHelper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/SettingsHelper.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config;
+package org.opensearch.performanceanalyzer.config;
 
 
 import java.io.FileInputStream;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/TroubleshootingConfig.java b/src/main/java/org/opensearch/performanceanalyzer/config/TroubleshootingConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/TroubleshootingConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/TroubleshootingConfig.java
index 9eecc0d76..4a84e231b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/TroubleshootingConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/TroubleshootingConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config;
+package org.opensearch.performanceanalyzer.config;
 
 public class TroubleshootingConfig {
     public static final boolean enableDevAssert = false;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java
index e961bb51f..4923feb30 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverrides.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
index 672cb62c0..318d201eb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.HashSet;
@@ -37,6 +34,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 /**
  * Class the manages applying the various overrides for RCAs, deciders, and action nodes as written
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java
index 2e7bedaa8..2b6f73d38 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelper.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java
rename to src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java
index 30972ac19..cdba748f3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesWrapper.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/core/Util.java b/src/main/java/org/opensearch/performanceanalyzer/core/Util.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/core/Util.java
rename to src/main/java/org/opensearch/performanceanalyzer/core/Util.java
index 953762856..686422124 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/core/Util.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/core/Util.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.core;
+package org.opensearch.performanceanalyzer.core;
 
 
 import java.io.File;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java
index dec0f8ddf..d335196ac 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/DecisionMakerConsts.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker;
+package org.opensearch.performanceanalyzer.decisionmaker;
 
 
 import com.google.gson.JsonParser;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/Action.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
index 2190ec51e..ccd074f19 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public interface Action {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java
index 903db1b5a..b88e30374 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ActionListener.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 /**
  * This listener is notified whenever an action suggestion is published by the decision maker
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java
index 26ed6d753..a65e8f7db 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java
@@ -24,12 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension.HEAP;
+import static org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension.HEAP;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
@@ -38,6 +36,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class CacheClearAction extends SuppressibleAction {
     public static final String NAME = "CacheClear";
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java
index 68061b60f..70de9643e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/FlipFlopDetector.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 /**
  * Records a series of actions and can determine whether a subsequent action would "flip flop" with
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
index 14ce0991b..a9577b34a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails.Id;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails.Ip;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.util.HashMap;
@@ -39,6 +35,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails.Id;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails.Ip;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class HeapSizeIncreaseAction extends SuppressibleAction {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
index aa7688b80..a687c2caa 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
 import java.util.Collections;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
index ca8bcc79d..212c08f96 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.util.HashMap;
@@ -37,6 +34,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * JvmGenAction modifies a generational Garbage Collector's tuning parameters
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
index ce324df8b..7a47f2a6e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
@@ -24,18 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
-
-import static com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.DecisionMakerConsts.JSON_PARSER;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension.HEAP;
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
+
+import static org.opensearch.performanceanalyzer.decisionmaker.DecisionMakerConsts.JSON_PARSER;
+import static org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension.HEAP;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -45,6 +38,13 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
 
 /**
  * Action class is used to modify the cache's max size. It is used by cache decider and other
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
index 041af1af7..ee57e6d1f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.DecisionMakerConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -45,6 +37,14 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.DecisionMakerConsts;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
 
 public class ModifyQueueCapacityAction extends SuppressibleAction {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
index 182bf7f55..5ad9a15d4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.AppContext;
 
 /** Actions that can be suppressed through a config. */
 public abstract class SuppressibleAction implements Action {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
index 52ea598c3..8b74a7ad8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collections.TimeExpiringSet;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import org.opensearch.performanceanalyzer.collections.TimeExpiringSet;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * A {@link FlipFlopDetector} whose recorded actions expire after a given period of time.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
index 00de58acd..81942b8bd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /**
  * Defines config for cache related actions.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
index 63bf80fb8..59f8d5239 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /**
  * Defines config for threadpool queue related actions
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java
index e07597a8d..f099132e8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/ThresholdConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
 public interface ThresholdConfig<T> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java
index 7311fb11c..d61869e58 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDecider.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
 import java.time.Instant;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
 
 public class AdmissionControlDecider extends Decider {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java
index 52250e030..200712498 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AlarmMonitor.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 /**
  * AlarmMonitor evaluates and maintains the state of an alarm.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
index 55630a5fe..2d65da826 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
@@ -24,24 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
+
+
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -49,6 +34,21 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 
 // TODO: 1. Create separate ActionConfig objects for different actions
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
index f9e6717bb..764e36a51 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * Generic base class outlining the basic structure of a Decider.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
index 398e08bb3..7d9f4177f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.ArrayList;
 import java.util.List;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class Decision extends GenericFlowUnit {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
index 45330bdf7..1ddb1a89d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
 import java.util.List;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
 
 /**
  * A DecisionPolicy evaluates a subset of observation summaries for a Decider, and returns a list of
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
similarity index 78%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
index 99bad61c1..aeb1ca252 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class EmptyFlowUnit extends GenericFlowUnit {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
index b641e03d4..f4289dc4b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
@@ -24,23 +24,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BasicBucketCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.collect.ImmutableMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BasicBucketCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public abstract class HeapBasedDecider extends Decider {
     private static final Logger LOG = LogManager.getLogger(HeapBasedDecider.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
similarity index 79%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
index d8bd1c968..f55f2a97b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
@@ -24,20 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.FlipFlopDetector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.TimedFlipFlopDetector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.PublisherEventsPersistor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -45,6 +34,17 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.FlipFlopDetector;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.TimedFlipFlopDetector;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.persistence.PublisherEventsPersistor;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class Publisher extends NonLeafNode<EmptyFlowUnit> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
similarity index 79%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
index 0da1521ab..5960d3558 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
@@ -24,25 +24,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 
 // This is a sample decider implementation to finalize decision maker interfaces.
 // TODO: 1. Read action priorities from a configurable yml
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
index 328cbaf22..200d2d01b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -42,6 +35,13 @@
 import java.util.List;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Collator collects and prunes the candidate decisions from each decider so that their impacts are
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
index 5b04c408c..f163082c6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,6 +35,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Dimension;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector.Impact;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /** ImpactAssessment maintains and helps with updating impacts of actions on a node. */
 public class ImpactAssessment {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
index 45b3d6734..a6fde5468 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * ImpactAssessor is responsible for assessing the impact of various actions on the nodes and
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
index 35a6de55d..2d7710a47 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /** "cache-type": { "priority-order": ["fielddata-cache", "shard-request-cache"] } */
 public class CachePriorityOrderConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
index bc40f5323..f674f8508 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /**
  * "decider-config-settings": { // Define the type of workload we can expect on the cluster. // User
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
index cf6175994..21bcc54f2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /** "workload-type": { "prefer-ingest": true, "prefer-search": false } */
 public class WorkLoadTypeConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
index 0beac2eca..16945896a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /** "level-one-config": { "fielddata-cache-step-size": 1, "shard-request-cache-step-size": 1 } */
 public class LevelOneActionBuilderConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
index d65032f8e..2bdcf17cf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /** "level-three-config": { "write-queue-step-size": 2, "search-queue-step-size":2 } */
 public class LevelThreeActionBuilderConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
index 931f75849..3bbc80fb1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /**
  * "level-two-config": { "fielddata-cache-step-size": 2, "shard-request-cache-step-size": 2,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
index ead58a0f4..69b20e36c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /**
  * "decider-config-settings": { "old-gen-decision-policy-config": { "queue-bucket-size": 10,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
index d888d16e3..557cee04e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.JvmGenTuningPolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Config;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 import java.util.concurrent.TimeUnit;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.JvmGenTuningPolicy;
+import org.opensearch.performanceanalyzer.rca.framework.core.Config;
+import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 
 /**
  * Configures various options for the {@link JvmGenTuningPolicy}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java
similarity index 78%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java
index d5c181f5f..0c657cedd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/HeapHealthDecider.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.OldGenDecisionPolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing.HeapSizeIncreasePolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
 import java.util.List;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.OldGenDecisionPolicy;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing.HeapSizeIncreasePolicy;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
 
 /** decider to bring down heap usage in young gen / old gen */
 public class HeapHealthDecider extends Decider {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java
index b78b488fd..5051235e7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitor.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindowConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
 import com.google.common.annotations.VisibleForTesting;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindowConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
 
 public class JvmActionsAlarmMonitor implements AlarmMonitor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java
index 097c98bd1..ab1646c00 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicy.java
@@ -24,30 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.FULL_GC_PAUSE_TIME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.MINOR_GC_PAUSE_TIME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.OLD_GEN_HEAP_USAGE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.YOUNG_GEN_PROMOTION_RATE;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.FULL_GC_PAUSE_TIME;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.MINOR_GC_PAUSE_TIME;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.OLD_GEN_HEAP_USAGE;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil.YOUNG_GEN_PROMOTION_RATE;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindowConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import java.nio.file.Path;
@@ -57,6 +40,23 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.BucketizedSlidingWindowConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Decides if the JVM heap generations could be resized to improve application performance and
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java
index 40921852f..26e44e55c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelOneActionBuilder.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelOneActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelOneActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * build actions if old gen falls into level one bucket
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java
similarity index 79%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java
index 3553dbb03..7a856177e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelThreeActionBuilder.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelThreeActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.ArrayList;
 import java.util.List;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelThreeActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * build actions if old gen falls into level three bucket
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java
index bcb2cba76..dd7d159e5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/LevelTwoActionBuilder.java
@@ -24,29 +24,29 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.ThresholdConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.WorkLoadTypeConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelTwoActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.ThresholdConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.WorkLoadTypeConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelTwoActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.util.NodeConfigCacheReaderUtil;
 
 /**
  * build actions if old gen falls into level two bucket
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java
index c390de85c..1e71fb00a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/old_gen/OldGenDecisionPolicy.java
@@ -24,25 +24,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Decision policy for old gen related actions
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java
similarity index 79%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java
rename to src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java
index 730d4d590..047089c2a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicy.java
@@ -24,24 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.JvmActionsAlarmMonitor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -49,6 +34,21 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.DecisionPolicy;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.JvmActionsAlarmMonitor;
+import org.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
 
 public class HeapSizeIncreasePolicy implements DecisionPolicy {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/Disks.java b/src/main/java/org/opensearch/performanceanalyzer/hwnet/Disks.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/Disks.java
rename to src/main/java/org/opensearch/performanceanalyzer/hwnet/Disks.java
index ad848fcf7..1fd021918 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/Disks.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/hwnet/Disks.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.hwnet;
+package org.opensearch.performanceanalyzer.hwnet;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.DiskMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxDiskMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.SchemaFileParser;
 import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -40,6 +35,11 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.DiskMetrics;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxDiskMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.SchemaFileParser;
 
 public class Disks {
     private static Map<String, Map<String, Object>> diskKVMap = new HashMap<>();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/MountedPartitions.java b/src/main/java/org/opensearch/performanceanalyzer/hwnet/MountedPartitions.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/MountedPartitions.java
rename to src/main/java/org/opensearch/performanceanalyzer/hwnet/MountedPartitions.java
index 030fbdaa3..971aaf56e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/MountedPartitions.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/hwnet/MountedPartitions.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.hwnet;
+package org.opensearch.performanceanalyzer.hwnet;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MountedPartitionMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxMountedPartitionMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.SchemaFileParser;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.SchemaFileParser.FieldTypes;
 import com.google.common.collect.ImmutableSet;
 import java.io.File;
 import java.util.HashMap;
@@ -39,6 +34,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.opensearch.performanceanalyzer.collectors.MountedPartitionMetrics;
+import org.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxMountedPartitionMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.SchemaFileParser;
+import org.opensearch.performanceanalyzer.os.SchemaFileParser.FieldTypes;
 
 public class MountedPartitions {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkE2E.java b/src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkE2E.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkE2E.java
rename to src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkE2E.java
index 5c93ca8bb..2bdb748f1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkE2E.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkE2E.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.hwnet;
+package org.opensearch.performanceanalyzer.hwnet;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxTCPMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.OSGlobals;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedReader;
 import java.io.File;
@@ -44,6 +40,10 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxTCPMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.OSGlobals;
 
 public class NetworkE2E {
     /* Data sources:
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkInterface.java b/src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkInterface.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkInterface.java
rename to src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkInterface.java
index 9c64de84b..bd8602ed0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/hwnet/NetworkInterface.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/hwnet/NetworkInterface.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.hwnet;
+package org.opensearch.performanceanalyzer.hwnet;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NetInterfaceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxIPMetricsGenerator;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedReader;
 import java.io.File;
@@ -39,6 +35,10 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.NetInterfaceSummary;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxIPMetricsGenerator;
 
 public class NetworkInterface {
     private static final Logger LOG = LogManager.getLogger(NetworkInterface.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/jvm/GCMetrics.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/jvm/GCMetrics.java
index 701da4cb2..b40175526 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/jvm/GCMetrics.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
 import java.lang.management.GarbageCollectorMXBean;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java b/src/main/java/org/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java
rename to src/main/java/org/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java
index 31ae64397..1255a0871 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/jvm/GarbageCollectorInfo.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/jvm/HeapMetrics.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/jvm/HeapMetrics.java
index f56204ede..1838d7e28 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/jvm/HeapMetrics.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
 import java.lang.management.ManagementFactory;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadList.java b/src/main/java/org/opensearch/performanceanalyzer/jvm/ThreadList.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadList.java
rename to src/main/java/org/opensearch/performanceanalyzer/jvm/ThreadList.java
index d68b1cecc..21d84567a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadList.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/jvm/ThreadList.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import com.sun.tools.attach.VirtualMachine;
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -51,6 +45,12 @@
 import java.util.regex.Pattern;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import sun.tools.attach.HotSpotVirtualMachine;
 
 /** Traverses and prints the stack traces for all Java threads in the remote VM */
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/AllMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/AllMetrics.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/AllMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/AllMetrics.java
index 0af11863c..2760af0f5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/AllMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/AllMetrics.java
@@ -24,21 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
 
 /**
  * Contract between reader and writer. Writer write using the same values of these enums as json
- * keys (See all MetricStatus's subclasses in
- * com.amazon.opendistro.opensearch.performanceanalyzer.collectors), while reader creates db tables
- * using these keys as column names and extract values using these keys. You should make sure the
- * the field names in the MetricStatus's subclasses and enum names match. Also, when you change
- * anything, modify JsonKeyTest accordingly. We use camelCase instead of the usual capital case for
- * enum members because they have better readability for the above use cases.
+ * keys (See all MetricStatus's subclasses in org.opensearch.performanceanalyzer.collectors), while
+ * reader creates db tables using these keys as column names and extract values using these keys.
+ * You should make sure the the field names in the MetricStatus's subclasses and enum names match.
+ * Also, when you change anything, modify JsonKeyTest accordingly. We use camelCase instead of the
+ * usual capital case for enum members because they have better readability for the above use cases.
  */
 public class AllMetrics {
     // metric name (not complete, only metrics use the json format and contains
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricDimension.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricDimension.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricDimension.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/MetricDimension.java
index 5cfdaba5a..1d7bf87ca 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricDimension.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricDimension.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 /**
  * This helps writing a general parser. Given a MetricDimension, I can parse the metric file using
  * the values provided by the MetricDimension enum. I don't need to hardcode the exact enum name in
  * the parser. The parser only needs to know this enum has a metric's dimensions and use its members
  * as Json key to parse out the concrete metric dimensions. See
- * src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricProperties.java
+ * src/main/java/org/opensearch/performanceanalyzer/reader/MetricProperties.java
  */
 public interface MetricDimension {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricValue.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricValue.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/MetricValue.java
index c19b5d055..36c05be90 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricValue.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 /**
  * This helps writing a general parser. Given a MetricValue, I can parse the metric file using the
  * values provided by the MetricValue enum. I don't need to hardcode the exact enum name in the
  * parser. The parser only needs to know this enum has a metric's values and use its members as Json
  * key to parse out the concrete metric values. See
- * src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricProperties.java
+ * src/main/java/org/opensearch/performanceanalyzer/reader/MetricProperties.java
  */
 public interface MetricValue {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java
similarity index 67%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java
index 66ece8584..d7a7df38a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsConfiguration.java
@@ -24,27 +24,27 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.DisksCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.GCInfoCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MetricsPurgeActivity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MountedPartitionMetricsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NetworkE2ECollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NetworkInterfaceCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.GCMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.HeapMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.ThreadList;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.OSGlobals;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadCPU;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadDiskIO;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadSched;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.collectors.DisksCollector;
+import org.opensearch.performanceanalyzer.collectors.GCInfoCollector;
+import org.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
+import org.opensearch.performanceanalyzer.collectors.MetricsPurgeActivity;
+import org.opensearch.performanceanalyzer.collectors.MountedPartitionMetricsCollector;
+import org.opensearch.performanceanalyzer.collectors.NetworkE2ECollector;
+import org.opensearch.performanceanalyzer.collectors.NetworkInterfaceCollector;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.jvm.GCMetrics;
+import org.opensearch.performanceanalyzer.jvm.HeapMetrics;
+import org.opensearch.performanceanalyzer.jvm.ThreadList;
+import org.opensearch.performanceanalyzer.os.OSGlobals;
+import org.opensearch.performanceanalyzer.os.ThreadCPU;
+import org.opensearch.performanceanalyzer.os.ThreadDiskIO;
+import org.opensearch.performanceanalyzer.os.ThreadSched;
 
 public class MetricsConfiguration {
     public static final int SAMPLING_INTERVAL = 5000;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsProcessor.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsProcessor.java
index 932f8630b..c4064d9de 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsProcessor.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.core.Util;
 
 public interface MetricsProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java
index 96859b134..88e63b2e0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/MetricsRestUtil.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
 import java.security.InvalidParameterException;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java
index d274b47e3..d106de875 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetrics.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,6 +37,10 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 @SuppressWarnings("checkstyle:constantname")
 public class PerformanceAnalyzerMetrics {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java
index 7d362bdd0..2e78ec520 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/ThreadIDUtil.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.jvm.ThreadList;
+import org.opensearch.performanceanalyzer.jvm.ThreadList;
 
 public final class ThreadIDUtil {
     private ThreadIDUtil() {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java b/src/main/java/org/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java
index ddeb479f6..17d496b4a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics/handler/MetricsServerHandler.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics.handler;
+package org.opensearch.performanceanalyzer.metrics.handler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import io.grpc.stub.StreamObserver;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +34,10 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 public class MetricsServerHandler {
     private static final Logger LOG = LogManager.getLogger(MetricsServerHandler.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java
index ed3d14bbd..ac986f695 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/CPUPagingActivityGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 public interface CPUPagingActivityGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java
index 1cb87aee8..9131e5fe5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskIOMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 public interface DiskIOMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java
index 09eb5ca50..fc7896a9d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/DiskMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 
 import java.util.Set;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java
index 56d2d4a46..7cb8abfc6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/IPMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 public interface IPMetricsGenerator {
     double getInPacketRate4();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java
index bb5edac3a..c61fcdc4b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/MountedPartitionMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 
 import java.util.Set;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java
index e344b811f..6e087c043 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/OSMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 
 import java.util.Set;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java
index 42930fa1d..b635d6c47 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/SchedMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 public interface SchedMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java
index 89e0814a8..754b3d5a8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/TCPMetricsGenerator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator;
+package org.opensearch.performanceanalyzer.metrics_generator;
 
 
 import java.util.Set;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java
index 73467ee30..999430435 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxCPUPagingActivityGenerator.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadCPU;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
+import org.opensearch.performanceanalyzer.os.ThreadCPU;
 
 public class LinuxCPUPagingActivityGenerator implements CPUPagingActivityGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java
index b1bb5f94a..8d9aa5596 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskIOMetricsGenerator.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadDiskIO;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.ThreadDiskIO;
 
 public class LinuxDiskIOMetricsGenerator implements DiskIOMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java
index 88c8fd4b4..6eae92972 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxDiskMetricsGenerator.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.DiskMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.Disks;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
 import java.util.Map;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.collectors.DiskMetrics;
+import org.opensearch.performanceanalyzer.hwnet.Disks;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
 
 public class LinuxDiskMetricsGenerator implements DiskMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java
index dc0ecdcbe..7f8a14c84 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxIPMetricsGenerator.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NetInterfaceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
+import org.opensearch.performanceanalyzer.collectors.NetInterfaceSummary;
+import org.opensearch.performanceanalyzer.hwnet.NetworkInterface;
+import org.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
 
 public class LinuxIPMetricsGenerator implements IPMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java
index 5da1b32b5..00ac929b4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxMountedPartitionMetricsGenerator.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MountedPartitionMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.MountedPartitions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
 import com.google.common.collect.ImmutableSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.collectors.MountedPartitionMetrics;
+import org.opensearch.performanceanalyzer.hwnet.MountedPartitions;
+import org.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
 
 public class LinuxMountedPartitionMetricsGenerator implements MountedPartitionMetricsGenerator {
     private static final Map<String, MountedPartitionMetrics> suppliers = new HashMap<>();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java
similarity index 61%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java
index 606673dde..94e25d4bb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxOSMetricsGenerator.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.Disks;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.MountedPartitions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkE2E;
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.OSGlobals;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadCPU;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadDiskIO;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadSched;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
+
+
 import java.util.Set;
+import org.opensearch.performanceanalyzer.hwnet.Disks;
+import org.opensearch.performanceanalyzer.hwnet.MountedPartitions;
+import org.opensearch.performanceanalyzer.hwnet.NetworkE2E;
+import org.opensearch.performanceanalyzer.hwnet.NetworkInterface;
+import org.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.MountedPartitionMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.OSGlobals;
+import org.opensearch.performanceanalyzer.os.ThreadCPU;
+import org.opensearch.performanceanalyzer.os.ThreadDiskIO;
+import org.opensearch.performanceanalyzer.os.ThreadSched;
 
 public class LinuxOSMetricsGenerator implements OSMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java
index 2300d9243..6f7a9fdd0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxSchedMetricsGenerator.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.ThreadSched;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
+import org.opensearch.performanceanalyzer.os.ThreadSched;
 
 public class LinuxSchedMetricsGenerator implements SchedMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java
rename to src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java
index 2f8967444..ce36638a1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metrics_generator/linux/LinuxTCPMetricsGenerator.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux;
+package org.opensearch.performanceanalyzer.metrics_generator.linux;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkE2E;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
 import java.util.Map;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.hwnet.NetworkE2E;
+import org.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator;
 
 public class LinuxTCPMetricsGenerator implements TCPMetricsGenerator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Dimensions.java b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/Dimensions.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Dimensions.java
rename to src/main/java/org/opensearch/performanceanalyzer/metricsdb/Dimensions.java
index 2a117dde9..63e1864e5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Dimensions.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/Dimensions.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb;
+package org.opensearch.performanceanalyzer.metricsdb;
 
 
 import java.util.HashMap;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Metric.java b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/Metric.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Metric.java
rename to src/main/java/org/opensearch/performanceanalyzer/metricsdb/Metric.java
index 6356a6a21..9dd1201aa 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/Metric.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/Metric.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb;
+package org.opensearch.performanceanalyzer.metricsdb;
 
 public class Metric<T> {
     private String name;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDB.java b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDB.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDB.java
rename to src/main/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDB.java
index 841662930..e4b916380 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDB.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDB.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb;
+package org.opensearch.performanceanalyzer.metricsdb;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.Removable;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -63,6 +58,11 @@
 import org.jooq.TableLike;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.reader.Removable;
 
 /**
  * On-disk database that holds a 5 second snapshot of all metrics. We create one table per metric.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricAttributes.java b/src/main/java/org/opensearch/performanceanalyzer/model/MetricAttributes.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricAttributes.java
rename to src/main/java/org/opensearch/performanceanalyzer/model/MetricAttributes.java
index 5ce67bacb..7ed9a6516 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricAttributes.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/model/MetricAttributes.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.model;
+package org.opensearch.performanceanalyzer.model;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricDimension;
 import java.util.HashSet;
+import org.opensearch.performanceanalyzer.metrics.MetricDimension;
 
 public class MetricAttributes {
     public String unit;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricsModel.java b/src/main/java/org/opensearch/performanceanalyzer/model/MetricsModel.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricsModel.java
rename to src/main/java/org/opensearch/performanceanalyzer/model/MetricsModel.java
index 051c6129f..840b1d5f7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/MetricsModel.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/model/MetricsModel.java
@@ -24,44 +24,44 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.model;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.AggregatedOSDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CommonMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ElectionTermValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.EmptyDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HttpMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HttpOnlyDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.LatencyDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MetricUnits;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.OSMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardBulkMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardOperationMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsDerivedDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolValue;
+package org.opensearch.performanceanalyzer.model;
+
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.AggregatedOSDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CommonMetric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ElectionTermValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.EmptyDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HttpMetric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HttpOnlyDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.LatencyDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MetricUnits;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.OSMetrics;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardBulkMetric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardOperationMetric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsDerivedDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolValue;
 
 public class MetricsModel {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCConnectionManager.java b/src/main/java/org/opensearch/performanceanalyzer/net/GRPCConnectionManager.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCConnectionManager.java
rename to src/main/java/org/opensearch/performanceanalyzer/net/GRPCConnectionManager.java
index e08c48ed8..4ed27d4eb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCConnectionManager.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/net/GRPCConnectionManager.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
+package org.opensearch.performanceanalyzer.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc.InterNodeRpcServiceStub;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.common.annotations.VisibleForTesting;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -46,6 +42,10 @@
 import javax.net.ssl.SSLException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
+import org.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc.InterNodeRpcServiceStub;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * Class that manages the channel to other hosts in the cluster. It also performs staleness checks,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetClient.java b/src/main/java/org/opensearch/performanceanalyzer/net/NetClient.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetClient.java
rename to src/main/java/org/opensearch/performanceanalyzer/net/NetClient.java
index c7f8b9c6f..9f839998c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetClient.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/net/NetClient.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+package org.opensearch.performanceanalyzer.net;
+
+
 import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;
 import java.util.Map;
@@ -47,6 +35,18 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * This class aims to abstract out managing client connections to the server and other boilerplate
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetServer.java b/src/main/java/org/opensearch/performanceanalyzer/net/NetServer.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetServer.java
rename to src/main/java/org/opensearch/performanceanalyzer/net/NetServer.java
index bb3e5ba75..8b03cea45 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/NetServer.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/net/NetServer.java
@@ -24,20 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
+package org.opensearch.performanceanalyzer.net;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import io.grpc.Server;
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
@@ -54,6 +43,17 @@
 import javax.net.ssl.SSLException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.InterNodeRpcServiceGrpc;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
+import org.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
+import org.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
 
 /** Class that runs the RPC server and implements the RPC methods. */
 public class NetServer extends InterNodeRpcServiceGrpc.InterNodeRpcServiceImplBase
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/OSGlobals.java b/src/main/java/org/opensearch/performanceanalyzer/os/OSGlobals.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/OSGlobals.java
rename to src/main/java/org/opensearch/performanceanalyzer/os/OSGlobals.java
index 80ea0f6b0..d855299dd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/OSGlobals.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/os/OSGlobals.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.ConfigStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +34,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.ConfigStatus;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 
 public class OSGlobals {
     private static long scClkTck;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/SchemaFileParser.java b/src/main/java/org/opensearch/performanceanalyzer/os/SchemaFileParser.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/SchemaFileParser.java
rename to src/main/java/org/opensearch/performanceanalyzer/os/SchemaFileParser.java
index 08c995344..3d03601c8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/SchemaFileParser.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/os/SchemaFileParser.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -40,6 +38,8 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
 
 public class SchemaFileParser {
     private static final Logger LOGGER = LogManager.getLogger(SchemaFileParser.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPU.java b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadCPU.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPU.java
rename to src/main/java/org/opensearch/performanceanalyzer/os/ThreadCPU.java
index f49c2e217..91cbd94cd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPU.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadCPU.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxCPUPagingActivityGenerator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxCPUPagingActivityGenerator;
 
 public final class ThreadCPU {
     private static final Logger LOGGER = LogManager.getLogger(ThreadCPU.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIO.java b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadDiskIO.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIO.java
rename to src/main/java/org/opensearch/performanceanalyzer/os/ThreadDiskIO.java
index 8b2c0fd3e..ecdea0c5a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIO.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadDiskIO.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxDiskIOMetricsGenerator;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -39,6 +36,9 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxDiskIOMetricsGenerator;
 
 public class ThreadDiskIO {
     private static String pid = OSGlobals.getPid();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSched.java b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadSched.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSched.java
rename to src/main/java/org/opensearch/performanceanalyzer/os/ThreadSched.java
index 2b8d2cfe1..c0afaa5f0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSched.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/os/ThreadSched.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxSchedMetricsGenerator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +34,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
+import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxSchedMetricsGenerator;
 
 public final class ThreadSched {
     private static final Logger LOGGER = LogManager.getLogger(ThreadSched.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/Plugin.java b/src/main/java/org/opensearch/performanceanalyzer/plugins/Plugin.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/Plugin.java
rename to src/main/java/org/opensearch/performanceanalyzer/plugins/Plugin.java
index f73929940..b258a77db 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/Plugin.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/plugins/Plugin.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.plugins;
+package org.opensearch.performanceanalyzer.plugins;
 
 /**
  * Allows adding custom extensions to the analysis graph.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginController.java b/src/main/java/org/opensearch/performanceanalyzer/plugins/PluginController.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginController.java
rename to src/main/java/org/opensearch/performanceanalyzer/plugins/PluginController.java
index a781a3e56..26b153f42 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginController.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/plugins/PluginController.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.plugins;
+package org.opensearch.performanceanalyzer.plugins;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
 import com.google.common.annotations.VisibleForTesting;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -36,6 +34,8 @@
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
 
 public class PluginController {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java b/src/main/java/org/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java
index 00336c341..9c817d527 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/plugins/PluginControllerConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.plugins;
+package org.opensearch.performanceanalyzer.plugins;
 
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java b/src/main/java/org/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java
rename to src/main/java/org/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java
index a8f416a24..64d2bdddf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/plugins/PublisherEventsLogger.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.plugins;
+package org.opensearch.performanceanalyzer.plugins;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
 
 /** A simple listener that logs all actions published by the publisher */
 public class PublisherEventsLogger extends Plugin implements ActionListener {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/README.md b/src/main/java/org/opensearch/performanceanalyzer/rca/README.md
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/README.md
rename to src/main/java/org/opensearch/performanceanalyzer/rca/README.md
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaController.java b/src/main/java/org/opensearch/performanceanalyzer/rca/RcaController.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaController.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/RcaController.java
index cf632ed88..ef3ae10ac 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaController.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/RcaController.java
@@ -24,44 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.ClientServers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetServer;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.PersistenceFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
+package org.opensearch.performanceanalyzer.rca;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.net.httpserver.HttpServer;
 import java.io.IOException;
@@ -81,6 +46,41 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.ClientServers;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.net.NetServer;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
+import org.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
+import org.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
+import org.opensearch.performanceanalyzer.rca.persistence.PersistenceFactory;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
+import org.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
+import org.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
+import org.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
 
 /**
  * This is responsible for bootstrapping the RCA. It sets the necessary state, initializes the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerHelper.java b/src/main/java/org/opensearch/performanceanalyzer/rca/RcaControllerHelper.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerHelper.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/RcaControllerHelper.java
index 50ab9852d..8eea01c17 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerHelper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/RcaControllerHelper.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
+package org.opensearch.performanceanalyzer.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.io.BufferedReader;
@@ -48,6 +43,11 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class RcaControllerHelper {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/Version.java b/src/main/java/org/opensearch/performanceanalyzer/rca/Version.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/Version.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/Version.java
index 7fc4f1497..bba506054 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/Version.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/Version.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
+package org.opensearch.performanceanalyzer.rca;
 
 /**
  * The version of the RCA framework and the graphs combined. The version is a combination of the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java
index 884eedb5b..0cf646d69 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/FieldDataCacheRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /** config object to store rca config settings for FieldDataCacheRca */
 public class FieldDataCacheRcaConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java
index 27522a5e2..df3470a33 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HeapSizeIncreasePolicyConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class HeapSizeIncreasePolicyConfig {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java
index ee8625625..b34f19b3b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageOldGenRcaConfig.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /** config object to store rca config settings in rca.conf */
 public class HighHeapUsageOldGenRcaConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java
index 59198d678..e04c5beff 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighHeapUsageYoungGenRcaConfig.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class HighHeapUsageYoungGenRcaConfig {
     private static final Logger LOG = LogManager.getLogger(HighHeapUsageYoungGenRcaConfig.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java
index 550abb9c0..c989bce78 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HighOldGenOccupancyRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class HighOldGenOccupancyRcaConfig {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java
index 6f12f85d5..f4a334d9e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotNodeClusterRcaConfig.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /** config object to store rca config settings for HotNodeClusterRca */
 public class HotNodeClusterRcaConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java
index 10ae90835..3f5130322 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardClusterRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class HotShardClusterRcaConfig {
     public static final String CONFIG_NAME = "hot-shard-cluster-rca";
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java
index f2ebec7c6..2a887fa04 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/HotShardRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class HotShardRcaConfig {
     public static final String CONFIG_NAME = "hot-shard-rca";
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java
index 92705aff4..f50dad6dc 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/OldGenContendedRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class OldGenContendedRcaConfig {
     private static final String CONFIG_NAME = "old-gen-contended-rca-config";
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java
index 9367e6822..bdebb88d2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class QueueRejectionRcaConfig {
     private Integer rejectionTimePeriodInSeconds;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java
index 47c93bbe8..9097673ec 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/configs/ShardRequestCacheRcaConfig.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 /** config object to store rca config settings for ShardRequestCacheRca */
 public class ShardRequestCacheRcaConfig {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java
index c429de25e..d4c615fa5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraph.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 public class MalformedAnalysisGraph extends RuntimeException {
     public MalformedAnalysisGraph(String message) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java
index 967552e8d..339939a66 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 public class MalformedConfig extends Exception {
     public MalformedConfig(String fileLocation, String errorMessage) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java
index 41f9d8f1d..ad0cc214c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedThresholdFile.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 public class MalformedThresholdFile extends MalformedConfig {
     public MalformedThresholdFile(String fileLocation, String errorMessage) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java
index a9a7ddc8e..65bd22ba6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderCountMismatch.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 public class OverridesAndPrecedenceOrderCountMismatch extends MalformedThresholdFile {
     public OverridesAndPrecedenceOrderCountMismatch(String fileLocation, String errorMessage) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java
index 247f2a9cc..1e31011c8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/exceptions/OverridesAndPrecedenceOrderValueMismatch.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 public class OverridesAndPrecedenceOrderValueMismatch extends MalformedThresholdFile {
     public OverridesAndPrecedenceOrderValueMismatch(String fileLocation, String errorMessage) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java b/src/main/java/org/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java
index 725246161..7bb0dd933 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/formatter/StatsCollectorFormatter.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.formatter;
+package org.opensearch.performanceanalyzer.rca.formatter;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class StatsCollectorFormatter implements Formatter {
     StringBuilder formatted;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java
index 1c8ba4763..c566fe61c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/AnalysisGraph.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 /*
  * This is the container for all the Analysis dependency graphs. Usually this is the first class that is created
@@ -32,12 +32,12 @@
  */
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
 
 public abstract class AnalysisGraph {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java
index 4bcc81649..374c6d768 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/BooleanAggregator.java
@@ -24,9 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Aggregator;
+import org.opensearch.performanceanalyzer.rca.framework.core.Aggregator;
 
 public class BooleanAggregator extends Aggregator {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Metric.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Metric.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Metric.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Metric.java
index 96b202113..c5b6c7f09 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Metric.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Metric.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.LeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.util.Collections;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.exception.DataAccessException;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.LeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public abstract class Metric extends LeafNode<MetricFlowUnit> {
     static final String[] metricList;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java
index 23df8c8e3..b6d559a69 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/OpenSearchConfigNode.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * this is a base class for node(vertex) in RCA graph that reads configuration settings from
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Rca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Rca.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Rca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Rca.java
index 50647be83..78265c726 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Rca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Rca.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public abstract class Rca<T extends ResourceFlowUnit> extends NonLeafNode<T> {
     private static final Logger LOG = LogManager.getLogger(Rca.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Resources.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Resources.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Resources.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Resources.java
index c4bf5c1d1..3d2c0926c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Resources.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Resources.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 public class Resources {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Symptom.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Symptom.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Symptom.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Symptom.java
index e7dd56d83..4a30a41b8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/Symptom.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/Symptom.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.util.Collections;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public abstract class Symptom extends NonLeafNode<SymptomFlowUnit> {
     private static final Logger LOG = LogManager.getLogger(Symptom.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java
index 2359725ad..76e955d7a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindow.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
 import java.io.IOException;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java
index 589ae93e9..3d29c0400 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
 import java.nio.file.Path;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java
index 828e2a499..d6e1a2c68 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverage.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 /**
  * To calculate the sliding window moving average.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java
index 3be25bc7c..3275fa5f3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindow.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.FileRotate;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -42,6 +41,7 @@
 import org.apache.commons.io.LineIterator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.persistence.FileRotate;
 
 /**
  * PersistableSlidingWindow is a SlidingWindow which can have its data written to and read from disk
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java
index 279106093..bfbe0acc1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindow.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
 import java.util.Deque;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java
index c31e57860..c58ae7b30 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowData.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 /**
  * SlidingWindowData holds a timestamp in ms and a double value. It is the basic datatype used by a
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java
index 593464e8b..c138a2b59 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/Sum.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 public class Sum {
     double sum;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java
index 74711bc33..d531e0b27 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContext.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts;
+package org.opensearch.performanceanalyzer.rca.framework.api.contexts;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceContextMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
 import java.util.ArrayList;
 import java.util.List;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.ResourceContextMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
 
 /** context that goes along with ResourceFlowUnit. */
 public class ResourceContext extends GenericContext {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java
index 6893a50db..cf30c9172 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContext.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts;
+package org.opensearch.performanceanalyzer.rca.framework.api.contexts;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
 
 public class SymptomContext extends GenericContext {
     public SymptomContext(Resources.State state) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java
index 776b682da..0b3d042c8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/MetricFlowUnit.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class MetricFlowUnit extends GenericFlowUnit {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java
index e1e72fa56..445b98548 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnit.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage.SummaryOneofCase;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units;
+
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage.SummaryOneofCase;
+import org.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /** a flowunit type to carry OpenSearch node configurations (queue/cache capacities, etc.) */
 public class NodeConfigFlowUnit extends ResourceFlowUnit<HotNodeSummary> {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java
index d87344724..cfd4cf2ec 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/ResourceFlowUnit.java
@@ -24,23 +24,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * ResourceFlowUnit is the flowunit type that is emitted by RCA vertex. It is persisted in the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java
index 1e761e8cf..6cecd1b2c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/SymptomFlowUnit.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.SymptomContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.List;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.SymptomContext;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class SymptomFlowUnit extends GenericFlowUnit {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java
similarity index 74%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java
index 7c0418524..b7c002ce6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/ClusterTemperatureFlowUnit.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class ClusterTemperatureFlowUnit extends ResourceFlowUnit<ClusterTemperatureSummary> {
     private final ClusterTemperatureSummary clusterTemperatureSummary;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java
index 2be46933a..69fa5fd57 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/CompactNodeTemperatureFlowUnit.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * This is a grpc wrapper on top of the CompactNodeTemperatureSummary. The flow unit is passed
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java
similarity index 78%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java
index 81c81a558..e7f580696 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/temperature/DimensionalTemperatureFlowUnit.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * This is the FlowUnit wrapper over the summary of the given node across all the tracked dimension.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java
index 4854e65c2..b32aae567 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_CurrentValue.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class AdmissionControl_CurrentValue extends Metric {
     public AdmissionControl_CurrentValue(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java
index 58f259ea0..bcea53457 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_RejectionCount.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class AdmissionControl_RejectionCount extends Metric {
     public AdmissionControl_RejectionCount(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java
index b00698779..c62354c2c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/AdmissionControl_ThresholdValue.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class AdmissionControl_ThresholdValue extends Metric {
     public AdmissionControl_ThresholdValue(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java
index 1d57f3408..ba267bc83 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Bitset_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Bitset_Memory extends Metric {
     public Bitset_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java
index 99ceaa803..a8766390f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_ConfiguredSize.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class CB_ConfiguredSize extends Metric {
     public CB_ConfiguredSize(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java
index 9c5f0eb02..aca64b19b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_EstimatedSize.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class CB_EstimatedSize extends Metric {
     public CB_EstimatedSize(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java
index f5f0b41be..3915bf698 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CB_TrippedEvents.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class CB_TrippedEvents extends Metric {
     public CB_TrippedEvents(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java
index 6128d9956..23d1aed48 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/CPU_Utilization.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class CPU_Utilization extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.CPU_UTILIZATION.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java
index f63256bb1..69058394b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Eviction.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_FieldData_Eviction extends Metric {
     public static final String NAME =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java
index ba3d92906..4ad53f236 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_FieldData_Size.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_FieldData_Size extends Metric {
     public static final String NAME = AllMetrics.ShardStatsValue.CACHE_FIELDDATA_SIZE.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java
index 3442c577a..9aa66fcd6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Max_Size.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Max_Size extends Metric {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java
index f9f97a6ef..f13e2ef9a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Hit.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Query_Hit extends Metric {
     public Cache_Query_Hit(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java
index caface945..977f81761 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Miss.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Query_Miss extends Metric {
     public Cache_Query_Miss(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java
index 73a79612d..3803ae51a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Query_Size.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Query_Size extends Metric {
     public Cache_Query_Size(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java
index f572cf73e..0f8d64ec6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Eviction.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Request_Eviction extends Metric {
     public static final String NAME = AllMetrics.ShardStatsValue.CACHE_REQUEST_EVICTION.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java
index 084360d66..bf813b3d0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Hit.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Request_Hit extends Metric {
     public static final String NAME = AllMetrics.ShardStatsValue.CACHE_REQUEST_HIT.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java
index 7a364f2d4..0074d764e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Miss.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Request_Miss extends Metric {
     public static final String NAME = AllMetrics.ShardStatsValue.CACHE_REQUEST_MISS.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java
index d961dd15d..27fa5675a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Cache_Request_Size.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Cache_Request_Size extends Metric {
     public static final String NAME = AllMetrics.ShardStatsValue.CACHE_REQUEST_SIZE.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java
index 5fd432917..44a6e0a7f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Failure.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ClusterApplierService_Failure extends Metric {
     public ClusterApplierService_Failure(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java
index 569d4dc4a..28a449606 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ClusterApplierService_Latency.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ClusterApplierService_Latency extends Metric {
     public ClusterApplierService_Latency(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java
index 656d25926..c6867351b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_ServiceRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Disk_ServiceRate extends Metric {
     public Disk_ServiceRate(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java
index 3ca0a5289..fee598119 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_Utilization.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Disk_Utilization extends Metric {
     public Disk_Utilization(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java
index 50c3bd386..fc0b11c55 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Disk_WaitTime.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Disk_WaitTime extends Metric {
     public Disk_WaitTime(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java
index f056a3718..a09393114 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/DocValues_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class DocValues_Memory extends Metric {
     public DocValues_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java
index 2f52657dd..5f9000cb5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ElectionTerm.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ElectionTerm extends Metric {
     public ElectionTerm(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java
index b623b285e..c85739cda 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Event.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Flush_Event extends Metric {
     public Flush_Event(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java
index 75a6e4d6d..d4fd23e7c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Flush_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Flush_Time extends Metric {
     public Flush_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java
index c04596fac..887b49e5a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Event.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class GC_Collection_Event extends Metric {
     public static final String NAME = AllMetrics.HeapValue.GC_COLLECTION_EVENT.name();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java
index 1dac17941..7a674bb7d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Collection_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class GC_Collection_Time extends Metric {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java
index d6df3fe86..f05a147cf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/GC_Type.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class GC_Type extends Metric {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java
index b0e8d17f5..4be648b40 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_RequestDocs.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class HTTP_RequestDocs extends Metric {
     public HTTP_RequestDocs(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java
index 4a04bed53..243de4cd3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/HTTP_TotalRequests.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class HTTP_TotalRequests extends Metric {
     public HTTP_TotalRequests(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java
index 5da1aa7bc..387fd2a24 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_AllocRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Heap_AllocRate extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.HEAP_ALLOC_RATE.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java
index 6a9321db6..9184a713f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Committed.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Heap_Committed extends Metric {
     public Heap_Committed(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java
index 725b1ea1b..7a4e37926 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Init.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Heap_Init extends Metric {
     public Heap_Init(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java
index 8f6678acf..45e2fc806 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Max.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Heap_Max extends Metric {
     public static final String NAME = AllMetrics.HeapValue.HEAP_MAX.name();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java
index d41897fbe..b22f9d846 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Heap_Used.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Heap_Used extends Metric {
     public static final String NAME = AllMetrics.HeapValue.HEAP_USED.name();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java
index b9273e115..46646ba86 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadSyscallRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_ReadSyscallRate extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.IO_READ_SYSCALL_RATE.name();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java
index 610da0fc1..9cdaaf324 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_ReadThroughput.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_ReadThroughput extends Metric {
     public IO_ReadThroughput(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java
index a8d37d5cf..a8c3c011a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotThroughput.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_TotThroughput extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.IO_TOT_THROUGHPUT.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java
index c53fa2538..194a7706b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_TotalSyscallRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_TotalSyscallRate extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.IO_TOTAL_SYSCALL_RATE.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java
index af7878c02..e6fd50d88 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteSyscallRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_WriteSyscallRate extends Metric {
     public static final String NAME = AllMetrics.OSMetrics.IO_WRITE_SYSCALL_RATE.toString();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java
index 46231960f..5b2a42ee1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IO_WriteThroughput.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IO_WriteThroughput extends Metric {
     public IO_WriteThroughput(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java
index bbf86db41..ea0830185 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/IndexWriter_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class IndexWriter_Memory extends Metric {
     public IndexWriter_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java
index 9a3a89ba6..79de80a0e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_Buffer.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Indexing_Buffer extends Metric {
     public Indexing_Buffer(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java
index 0bb226cb2..c0690b753 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Indexing_ThrottleTime.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Indexing_ThrottleTime extends Metric {
     public Indexing_ThrottleTime(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java
index 06b5f5e85..5749b435d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Latency.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Latency extends Metric {
     public Latency(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java
index 0b5b33c8f..76fb457cd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_PendingQueueSize.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Master_PendingQueueSize extends Metric {
     public Master_PendingQueueSize(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java
index efb6834d7..96fde287f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Queue_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Master_Task_Queue_Time extends Metric {
     public Master_Task_Queue_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java
index d3fc7a744..dbc0b35b1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Master_Task_Run_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Master_Task_Run_Time extends Metric {
     public Master_Task_Run_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java
index 053e9b308..a374e1a25 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_CurrentEvent.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Merge_CurrentEvent extends Metric {
     public Merge_CurrentEvent(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java
index 5b916fde4..6a40405d0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Event.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Merge_Event extends Metric {
     public Merge_Event(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java
index 12995d679..9d3f6568a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Merge_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Merge_Time extends Metric {
     public Merge_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java
index 7ab2c2b5f..827e0d00c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate4.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_PacketDropRate4 extends Metric {
     public Net_PacketDropRate4(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java
index d38fd82a1..7b9cf4c57 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketDropRate6.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_PacketDropRate6 extends Metric {
     public Net_PacketDropRate6(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java
index 446331d73..934b925bf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate4.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_PacketRate4 extends Metric {
     public Net_PacketRate4(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java
index 076e7317f..661034e58 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_PacketRate6.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_PacketRate6 extends Metric {
     public Net_PacketRate6(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java
index 1e66024f3..2bd9f201d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_Lost.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_Lost extends Metric {
     public Net_TCP_Lost(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java
index efa972260..49f91030e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_NumFlows.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_NumFlows extends Metric {
     public Net_TCP_NumFlows(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java
index e9c3ab7ff..411ff1ab7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_RxQ.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_RxQ extends Metric {
     public Net_TCP_RxQ(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java
index 98ec747e3..ec4af6aec 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SSThresh.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_SSThresh extends Metric {
     public Net_TCP_SSThresh(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java
index 9fbf7324f..7dd3de54f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_SendCWND.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_SendCWND extends Metric {
     public Net_TCP_SendCWND(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java
index f92e1dd15..8bf6511b7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_TCP_TxQ.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_TCP_TxQ extends Metric {
     public Net_TCP_TxQ(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java
index e39228e20..37b7b2576 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Net_Throughput.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Net_Throughput extends Metric {
     public Net_Throughput(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java
index c7d19cc0b..64b905028 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Norms_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Norms_Memory extends Metric {
     public Norms_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java
index 3bbe9fbc6..47098832d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MajfltRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Paging_MajfltRate extends Metric {
     public Paging_MajfltRate(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java
index 88b9bd9da..f519a35cd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_MinfltRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Paging_MinfltRate extends Metric {
     public Paging_MinfltRate(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java
index e77cfe702..778fdeb02 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Paging_RSS.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Paging_RSS extends Metric {
     public Paging_RSS(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java
index 22a75292c..eb88a5db3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Points_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Points_Memory extends Metric {
     public Points_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java
index 9d4b2be24..cfb8e89dc 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Failure.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
 
 public class PublishClusterState_Failure extends Metric {
     public PublishClusterState_Failure(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java
index bf8cb4783..6fe892041 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/PublishClusterState_Latency.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
 
 public class PublishClusterState_Latency extends Metric {
     public PublishClusterState_Latency(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java
index d291629c7..b98b0ef90 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Event.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Refresh_Event extends Metric {
     public Refresh_Event(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java
index 1a012fcda..3d0caa97b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Refresh_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Refresh_Time extends Metric {
     public Refresh_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java
index a4c59e0c7..dc9bba420 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_CtxRate.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Sched_CtxRate extends Metric {
     public Sched_CtxRate(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java
index 10b77ce5e..2a704df9b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Runtime.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Sched_Runtime extends Metric {
     public Sched_Runtime(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java
index 3c8f43ddb..dcc93cf4d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Sched_Waittime.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Sched_Waittime extends Metric {
     public Sched_Waittime(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java
index bc1c48bb1..cc0014c3d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Segments_Memory extends Metric {
     public Segments_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java
index 3c5e4616b..5b3d1213e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Segments_Total.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Segments_Total extends Metric {
     public Segments_Total(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java
index 274e624c6..ac0e21a4d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardBulkDocs.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ShardBulkDocs extends Metric {
     public ShardBulkDocs(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java
index 78a11bfd5..23cf8556a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardEvents.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ShardEvents extends Metric {
     public ShardEvents(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java
index bacaccc03..40ce084e4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ShardSize.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 /**
  * This metric is calculated from the Node Stat Metrics for a particular node and returns the per
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java
index a1f7e1190..89622fc8a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/StoredFields_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class StoredFields_Memory extends Metric {
     public StoredFields_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java
index 56875fcc8..33eb97833 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/TermVectors_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class TermVectors_Memory extends Metric {
     public TermVectors_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java
index d6fb1fd83..22558cd44 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Terms_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Terms_Memory extends Metric {
     public Terms_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java
index 38d0c20b5..056b6e837 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_ActiveThreads.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ThreadPool_ActiveThreads extends Metric {
     public ThreadPool_ActiveThreads(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java
index fcbea2ee2..1852d5f60 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueCapacity.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ThreadPool_QueueCapacity extends Metric {
     public static final String NAME =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java
index 52ebafdc2..4e0a6544e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_QueueSize.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ThreadPool_QueueSize extends Metric {
     public ThreadPool_QueueSize(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java
index 21a62c8e8..f641fa7a7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_RejectedReqs.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ThreadPool_RejectedReqs extends Metric {
     public static final String NAME =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java
index 0c85ce3d2..f20c72508 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/ThreadPool_TotalThreads.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class ThreadPool_TotalThreads extends Metric {
     public ThreadPool_TotalThreads(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java
index 7a496fbfc..8de0541c4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Event.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Thread_Blocked_Event extends Metric {
     public Thread_Blocked_Event(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java
index b53c86dd4..a3886dda5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/Thread_Blocked_Time.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class Thread_Blocked_Time extends Metric {
     public Thread_Blocked_Time(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java
index 035a28364..a5f3e9b35 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/VersionMap_Memory.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public class VersionMap_Memory extends Metric {
     public VersionMap_Memory(long evaluationIntervalSeconds) {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java
index c619471b4..c53ae0921 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/JooqFieldValue.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist;
+package org.opensearch.performanceanalyzer.rca.framework.api.persist;
 
 
 import org.jooq.Field;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java
index 5bfae3237..1c2cc5a83 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtil.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist;
+package org.opensearch.performanceanalyzer.rca.framework.api.persist;
 
 
 import java.util.List;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java
index c2c821742..06b860ef1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummary.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.protobuf.GeneratedMessageV3;
@@ -44,6 +41,9 @@
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 /**
  * HotClusterSummary is a cluster level summary. It collects and aggregates node summaries from each
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java
index f2d8837a7..37fd5f9ca 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummary.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
@@ -45,6 +40,11 @@
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /**
  * HotNodeSummary collects and aggregates hot resource summaries on each data node It contains info
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java
index 604157924..3dc3d34a9 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummary.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
@@ -44,6 +39,11 @@
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 /**
  * HotResourceSummary contains information such as the name of the hot resource, the current value
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java
index d174e29b9..bd916a356 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummary.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotShardSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
@@ -42,6 +38,10 @@
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotShardSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 /**
  * HotShardSummary contains information such as the index_name, shard_id, node_id, cpu_utilization,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java
index 156a88ea2..2a026ea97 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtil.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.AdditionalFields;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PANetworking;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.grpc.AdditionalFields;
+import org.opensearch.performanceanalyzer.grpc.MetricEnum;
+import org.opensearch.performanceanalyzer.grpc.PANetworking;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 /**
  * A utility class to parse and build grpc Resource message Resource message consist of two parts :
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java
index 8fac51c05..17fc6c3fd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilder.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import org.jooq.Record;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 public class SummaryBuilder<T extends GenericSummary> {
     private final String tableName;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java
index bc53ad118..3fcd02d68 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/SummaryBuilderFunction.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
 import org.jooq.Record;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java
index 487404a5e..ce369dfe2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummary.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.TopConsumerSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
@@ -42,6 +38,10 @@
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.TopConsumerSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.JooqFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 /** TopConsumerSummary contains the name and usage of a resource consumer. */
 public class TopConsumerSummary extends GenericSummary {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java
index 4e34531eb..33c6ac18f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculator.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 /**
  * BasicBucketCalculator is a {@link BucketCalculator} which places {@link Resource}s into {@link
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java
index 0ec41905e..54117bf8a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BucketCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 /**
  * A BucketCalculator identifies which {@link UsageBucket} a {@link Resource} should be placed into
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java
index 10153ffd7..a16996ef6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/UsageBucket.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.Resource;
 
 /**
  * A UsageBucket is associated with a {@link Resource} and identifies the state of that Resource. We
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java
index ec0a63fb6..75f591b51 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterDimensionalSummary.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -52,6 +44,14 @@
 import org.jooq.Result;
 import org.jooq.SelectJoinStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
 
 /**
  * This is the temperature summary at a cluster level. This categorizes all the nodes in the cluster
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java
index dedff0bcb..903653985 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ClusterTemperatureSummary.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -45,6 +40,11 @@
 import org.jooq.Result;
 import org.jooq.SelectJoinStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
 
 /**
  * This is the temperature profile of a cluster. It encapsulates all the summaries for all the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java
index bf43127c9..f97afa2b4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactClusterLevelNodeSummary.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS.HOST_IP_ADDRESS_COL_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS.NODE_ID_COL_NAME;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS.HOST_IP_ADDRESS_COL_NAME;
+import static org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS.NODE_ID_COL_NAME;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 
 /**
  * This object is instantiated on the elected master. This is the master's view of the {@code
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java
index c1acc1615..b5349efa5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/CompactNodeSummary.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.NodeTemperatureSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceTemperatureMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
@@ -48,6 +40,14 @@
 import org.jooq.Result;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.NodeTemperatureSummaryMessage;
+import org.opensearch.performanceanalyzer.grpc.ResourceTemperatureMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary.SQL_SCHEMA_CONSTANTS;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 
 /**
  * This is created at two places - on each node and again on the cluster. On the node we have the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java
index 52a928575..43a9a45bb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/FullNodeTemperatureSummary.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.protobuf.GeneratedMessageV3;
@@ -42,6 +37,11 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 
 /**
  * Full Node Temperature Summary contains the Node Details (ID and Address) and the list of
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java
index e5122fb14..69a18b299 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummary.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -52,6 +44,14 @@
 import org.jooq.Result;
 import org.jooq.SelectJoinStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 
 /**
  * A node dimension profile is categorization of all shards in the node into different heatZones
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java
index 16f19f156..d117cef03 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/ShardProfileSummary.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 import com.google.gson.JsonObject;
 import com.google.protobuf.GeneratedMessageV3;
 import java.util.ArrayList;
@@ -38,6 +34,10 @@
 import javax.annotation.Nullable;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 
 public class ShardProfileSummary extends GenericSummary {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java
index 751ffd4d8..2a4a39fe1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Aggregator.java
@@ -24,6 +24,6 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 public abstract class Aggregator {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java
index 607d68c08..a22d787b2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfJsonWrapper.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
@@ -35,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 // TODO: There should be a validation for the expected fields.
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Config.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Config.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Config.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Config.java
index 8cc98cdbb..2695c2baf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Config.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Config.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
 import java.util.Map;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java
index 831f583fd..5c5326a3a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ConnectedComponent.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
 import java.util.ArrayDeque;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Context.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Context.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Context.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Context.java
index 9cce0636a..b09afe98c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Context.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Context.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 public class Context {
     public static final String THRESHOLD = "threshold";
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java
index cc1a6de52..ec912e402 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Gatherable.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 public interface Gatherable<T> {
     T gather(Queryable queryable);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java
index 059578b8e..93c2aaa6e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericContext.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
 
 public abstract class GenericContext {
     private final Resources.State state;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java
index 2c98cc3de..03fa0cc9d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericFlowUnit.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 // TODO: Doc comments and a description of each member.
 public abstract class GenericFlowUnit {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java
index 634b1a531..58d2282af 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/GenericSummary.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -36,6 +35,7 @@
 import java.util.List;
 import org.jooq.Field;
 import org.jooq.Record;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
 
 public abstract class GenericSummary {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java
index cbd851890..72fe1a22e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/LeafNode.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 public abstract class LeafNode<T extends GenericFlowUnit> extends Node<T> implements Gatherable<T> {
     private boolean addedToFlowField;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java
index 7dfca8d53..6c6f9e9ec 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/MetricsDBProvider.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import java.util.Collections;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 public class MetricsDBProvider implements Queryable {
     private static final Logger LOG = LogManager.getLogger(MetricsDBProvider.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java
index 64ed52afd..ddf75d941 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfig.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
 import java.util.Map;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Node.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Node.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Node.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Node.java
index dabbaef4b..57a069eb3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Node.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Node.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,6 +34,10 @@
 import java.util.List;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public abstract class Node<T extends GenericFlowUnit> {
     // TODO: Make bounds explicit
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java
index 25e150327..fd40c5029 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/NonLeafNode.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
 
 public abstract class NonLeafNode<T extends GenericFlowUnit> extends Node<T>
         implements Operable<T> {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Operable.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Operable.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Operable.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Operable.java
index c08b97dc8..039b9bb74 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Operable.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Operable.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 /*
  * In order to operate an Operable, the input multiple streams and the output is one single stream. Each of the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Queryable.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Queryable.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Queryable.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Queryable.java
index 61bd6d817..309e607c1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Queryable.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Queryable.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public interface Queryable {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java
index 7bcd220a9..2a34ab3da 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConf.java
@@ -24,30 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaControllerHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighOldGenOccupancyRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotShardClusterRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotShardRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.OldGenContendedRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.QueueRejectionRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BasicBucketCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+package org.opensearch.performanceanalyzer.rca.framework.core;
+
+
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -75,6 +54,27 @@
 import java.util.function.Predicate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.rca.RcaControllerHelper;
+import org.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HighOldGenOccupancyRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HotShardClusterRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HotShardRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.OldGenContendedRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.QueueRejectionRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BasicBucketCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class RcaConf {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java
index f9625c473..2d1ac1fb6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/SortByIngressOrder.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
 import java.io.Serializable;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Stats.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Stats.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Stats.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Stats.java
index 84578c0bf..e1dc870bf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Stats.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Stats.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Threshold.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Threshold.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Threshold.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Threshold.java
index 4a24c069e..1bb03d30c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/Threshold.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/Threshold.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderCountMismatch;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderValueMismatch;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
+import org.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderCountMismatch;
+import org.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderValueMismatch;
 
 class Threshold {
     private final String name;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java
index 8b0649ace..7a06ab216 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/ThresholdMain.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -38,6 +37,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
 
 public class ThresholdMain {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java
index a6f6c6985..a3a500d67 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/HeatZoneAssigner.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.core.temperature;
 
 /** Given the units of the resource consumed and the total consumption and */
 public class HeatZoneAssigner {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java
index db17ca8be..9fbb72c88 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/RawMetricsVector.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.core.temperature;
 
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java
index 120316e96..562d8503a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/ShardStore.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.core.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nonnull;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 
 /**
  * The same set of shards will be seen for each metric and across multiple operations. This creates
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java
similarity index 74%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java
index d135a7282..f9b874804 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureDimension.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.core.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ShardSize;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ShardSize;
 
 /**
  * This class contains the dimensions over which we are calculating the Temperature profile. We are
@@ -36,11 +36,9 @@
  */
 public enum TemperatureDimension {
     CPU_Utilization(
-            com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics
-                    .CPU_Utilization.NAME),
+            org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization.NAME),
     Heap_AllocRate(
-            com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics
-                    .Heap_AllocRate.NAME),
+            org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate.NAME),
     Shard_Size_In_Bytes(ShardSize.NAME);
 
     public final String NAME;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java
index 5d23f2ca4..ed8e9cf76 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/core/temperature/TemperatureVector.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.core.temperature;
 
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java
index f1ae350e9..364e2fbb7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ExceptionsAndErrors.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum ExceptionsAndErrors implements MeasurementSet {
     RCA_FRAMEWORK_CRASH("RcaFrameworkCrash"),
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java
index 92219bc44..af17f183e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/JvmMetrics.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum JvmMetrics implements MeasurementSet {
     JVM_FREE_MEM_SAMPLER("JvmFreeMem", "bytes"),
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java
index 46bd5599c..46ecb68bb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaGraphMetrics.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum RcaGraphMetrics implements MeasurementSet {
     /** Time taken per run of the RCA graph */
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java
index fc3fce70e..8da23d8eb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaRuntimeMetrics.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum RcaRuntimeMetrics implements MeasurementSet {
     /** The number of times the framework was stopped by the operator. */
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java
index b79e89021..98dc6b32e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/RcaVerticesMetrics.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 /**
  * metrics added by each RCA vertex in RCA graph. All metrics under this category are RCA specific
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java
index f7837e834..99a2a4d25 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/ReaderMetrics.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum ReaderMetrics implements MeasurementSet {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java
index 8349a4aa5..cb3eea786 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/metrics/WriterMetrics.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public enum WriterMetrics implements MeasurementSet {
     SHARD_STATE_COLLECTOR_EXECUTION_TIME(
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java
index d075cad8a..fe233c36c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/AllJvmSamplers.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.sys;
+package org.opensearch.performanceanalyzer.rca.framework.sys;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 import java.util.Arrays;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class AllJvmSamplers {
     public static List<ISampler> getJvmSamplers() {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java
index 8fae10e93..d2da566df 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmFreeMem.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.sys;
+package org.opensearch.performanceanalyzer.rca.framework.sys;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class JvmFreeMem implements ISampler {
     @Override
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java
index 7071dbefd..9b5b7d325 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/sys/JvmTotalMem.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.sys;
+package org.opensearch.performanceanalyzer.rca.framework.sys;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class JvmTotalMem implements ISampler {
     @Override
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java
index 4d5956e1e..0fbb2e1a1 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetails.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
+package org.opensearch.performanceanalyzer.rca.framework.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.net.InetAddresses;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class InstanceDetails {
     public static class Ip {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java
index 2a0122bc1..7254960d6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaConsts.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
+package org.opensearch.performanceanalyzer.rca.framework.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
+import org.opensearch.performanceanalyzer.core.Util;
 
 public class RcaConsts {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java
index 2e6bf2ba1..5424d7130 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtil.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
+package org.opensearch.performanceanalyzer.rca.framework.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
 
 public class RcaUtil {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java
similarity index 78%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java
index c5420fd6d..efc66f909 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/framework/util/SQLiteQueryUtils.java
@@ -24,22 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit.ResourceFlowUnitFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
+package org.opensearch.performanceanalyzer.rca.framework.util;
+
+
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -50,6 +37,19 @@
 import org.jooq.Record;
 import org.jooq.SelectJoinStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit.ResourceFlowUnitFieldValue;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
 
 /** A utility class to query cluster, node and resource level summary for a rca */
 public class SQLiteQueryUtils {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java b/src/main/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java
index 6eaa8523f..e2d76cd69 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListener.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.listener;
+package org.opensearch.performanceanalyzer.rca.listener;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,6 +35,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class MisbehavingGraphOperateMethodListener implements IListener {
     private static final Logger LOG =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/DataMsg.java b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/DataMsg.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/DataMsg.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/messages/DataMsg.java
index 6ed4efd6a..c86252349 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/DataMsg.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/DataMsg.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages;
+package org.opensearch.performanceanalyzer.rca.messages;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
 
 public class DataMsg {
     String sourceGraphNode;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/IntentMsg.java b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/IntentMsg.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/IntentMsg.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/messages/IntentMsg.java
index e2fbf5d16..a0a93466d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/IntentMsg.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/IntentMsg.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages;
+package org.opensearch.performanceanalyzer.rca.messages;
 
 
 import java.util.Map;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java
index c932da1eb..d1d5e801c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/messages/UnicastIntentMsg.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages;
+package org.opensearch.performanceanalyzer.rca.messages;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class UnicastIntentMsg extends IntentMsg {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManager.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManager.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManager.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManager.java
index 1d98f5061..4f8646df3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManager.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManager.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.util.ClusterUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import java.util.HashSet;
@@ -38,6 +34,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.util.ClusterUtils;
 
 /** Manages the subscription state for the nodes in the graph. */
 public class NodeStateManager {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java
index fe6d9c07e..c492fcf8b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStore.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +36,10 @@
 import java.util.concurrent.ConcurrentMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 /**
  * An intermediate buffer that holds flow units received for different vertices from across the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java
index 3498e9d84..2c9912219 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandler.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /** Stream observer class that handles the response to a subscription request. */
 public class SubscribeResponseHandler implements StreamObserver<SubscribeResponse> {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java
index fd187806f..22a4e9d74 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManager.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import com.google.common.collect.ImmutableSet;
 import java.util.Arrays;
 import java.util.Collections;
@@ -41,6 +37,10 @@
 import java.util.concurrent.ConcurrentMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 /** Handles adding and removing of subscriptions for the vertices in the analysis graph. */
 public class SubscriptionManager {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopper.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/WireHopper.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopper.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/WireHopper.java
index 7c54ee097..9b82d65fa 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/WireHopper.java
@@ -24,23 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.UnicastIntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks.BroadcastSubscriptionTxTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks.FlowUnitTxTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks.UnicastSubscriptionTxTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.util.ClusterUtils;
+package org.opensearch.performanceanalyzer.rca.net;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -50,6 +36,20 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.messages.UnicastIntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.tasks.BroadcastSubscriptionTxTask;
+import org.opensearch.performanceanalyzer.rca.net.tasks.FlowUnitTxTask;
+import org.opensearch.performanceanalyzer.rca.net.tasks.UnicastSubscriptionTxTask;
+import org.opensearch.performanceanalyzer.rca.util.ClusterUtils;
 
 public class WireHopper {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java
index 74770e307..e7fe77ece 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/PublishRequestHandler.java
@@ -24,19 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse.PublishResponseStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks.FlowUnitRxTask;
+package org.opensearch.performanceanalyzer.rca.net.handler;
+
+
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +36,16 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse.PublishResponseStatus;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
+import org.opensearch.performanceanalyzer.rca.net.tasks.FlowUnitRxTask;
 
 /** Service handler for the /sendData RPC. */
 public class PublishRequestHandler {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java
index 208620804..e661a21ea 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/handler/SubscribeServerHandler.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler;
+package org.opensearch.performanceanalyzer.rca.net.handler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks.SubscriptionRxTask;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
+import org.opensearch.performanceanalyzer.rca.net.tasks.SubscriptionRxTask;
 
 /** Service handler for the subscribe RPC */
 public class SubscribeServerHandler {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java
index 300656357..bd23182c9 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/requests/CompositeSubscribeRequest.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.requests;
+package org.opensearch.performanceanalyzer.rca.net.requests;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
 import io.grpc.stub.StreamObserver;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
 
 /** Composite object that encapsulates the subscribe request message and the response stream. */
 public class CompositeSubscribeRequest {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java
index 664a75944..d0a79f638 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/BroadcastSubscriptionTxTask.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 
 /** Task that broadcasts a subscription request to the current node's peers. */
 public class BroadcastSubscriptionTxTask extends SubscriptionTxTask {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java
index ea5ec14ab..0edfe4419 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTask.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
 
 /** Task that processes received flow units. */
 public class FlowUnitRxTask implements Runnable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java
index 527b2190c..41afa84cd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitTxTask.java
@@ -24,25 +24,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.PublishResponse.PublishResponseStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 import io.grpc.stub.StreamObserver;
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse;
+import org.opensearch.performanceanalyzer.grpc.PublishResponse.PublishResponseStatus;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 
 /** Task that sends a flow unit to a remote host. */
 public class FlowUnitTxTask implements Runnable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java
index 6c4e8402c..76ef05416 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTask.java
@@ -24,21 +24,21 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
 import io.grpc.stub.StreamObserver;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse.SubscriptionStatus;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
 
 /** Task that processes received subscribe messages. */
 public class SubscriptionRxTask implements Runnable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java
similarity index 79%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java
index 59ffbad85..e5d870003 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionTxTask.java
@@ -24,23 +24,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscribeResponseHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 import java.util.Map;
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.SubscribeResponseHandler;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 
 /** Task to send out a subscription request. */
 public abstract class SubscriptionTxTask implements Runnable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java
index c046de655..0867c21ba 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/net/tasks/UnicastSubscriptionTxTask.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.UnicastIntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.messages.UnicastIntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
 
 /** Task that sends out one subscription request to a remote host. */
 public class UnicastSubscriptionTxTask extends SubscriptionTxTask {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGC.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileGC.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGC.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileGC.java
index 133919256..ee6a018cb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGC.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileGC.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
 import java.io.File;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotate.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotate.java
similarity index 99%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotate.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotate.java
index a12986c9d..dcdb0fa36 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotate.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotate.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
 import java.io.IOException;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java
index 0234d636d..4103bc8bc 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/NetPersistor.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -36,6 +35,7 @@
 import java.util.concurrent.ConcurrentMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
 
 @SuppressWarnings("unchecked")
 public class NetPersistor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/Persistable.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/Persistable.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/Persistable.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/Persistable.java
index 6a466026a..10da993ba 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/Persistable.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/Persistable.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonElement;
 import java.io.IOException;
@@ -41,6 +39,8 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.exception.DataAccessException;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
 
 public interface Persistable {
     /**
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java
index 8256770e6..c22e69341 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistenceFactory.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 /**
  * The interfaces are called to read data for a resource by the runtime before calling the operate
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java
index a6f7becfa..771ccd18d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PersistorBase.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -56,6 +53,9 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.exception.DataAccessException;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
 
 // TODO: Scheme to rotate the current file and garbage collect older files.
 public abstract class PersistorBase implements Persistable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java
index 0eb730bd2..b0d87652e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistor.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 /** A listener that persists all actions published by the publisher to rca.sqlite */
 public class PublisherEventsPersistor {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/RefColumn.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/RefColumn.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/RefColumn.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/RefColumn.java
index f96e9c127..ab85ad718 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/RefColumn.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/RefColumn.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java
index aee435588..22c8e4a7b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistor.java
@@ -24,21 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 import static org.jooq.impl.DSL.max;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources.State;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit.ResourceFlowUnitFieldValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.response.RcaResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -76,6 +65,17 @@
 import org.jooq.Table;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources.State;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit.ResourceFlowUnitFieldValue;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
+import org.opensearch.performanceanalyzer.rca.response.RcaResponse;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
 
 class SQLitePersistor extends PersistorBase {
     private enum GetterOrSetter {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java
index 3e688d3f0..73ba1eb24 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/ValueColumn.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
index a9d85c9fb..e1ccb19f8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/persistence/actions/PersistedAction.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions;
+package org.opensearch.performanceanalyzer.rca.persistence.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
 
 /**
  * Action summary that can be persisted in SQL
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/pyrometer/Api.java b/src/main/java/org/opensearch/performanceanalyzer/rca/pyrometer/Api.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/pyrometer/Api.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/pyrometer/Api.java
index 0fdb68c0e..59367b387 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/pyrometer/Api.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/pyrometer/Api.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.pyrometer;
+package org.opensearch.performanceanalyzer.rca.pyrometer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
 
 // TODO: This is just a placeholder. The methods are not implemented.
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponse.java b/src/main/java/org/opensearch/performanceanalyzer/rca/response/RcaResponse.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponse.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/response/RcaResponse.java
index b8809647c..898064ec2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponse.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/response/RcaResponse.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.response;
+package org.opensearch.performanceanalyzer.rca.response;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.protobuf.GeneratedMessageV3;
@@ -42,6 +38,10 @@
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 /**
  * RcaResponse contains cluster level info such as cluster state, number of healthy and unhealthy
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java
similarity index 73%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java
index 70985b0a0..7df5ccbf5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSampler.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 public class BatchMetricsEnabledSampler implements ISampler {
     private final AppContext appContext;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java
index 8da7e8469..8df59866b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSampler.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
@@ -42,6 +37,11 @@
 import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class MetricsDBFileSampler implements ISampler {
     private static final Logger LOG = LogManager.getLogger(MetricsDBFileSampler.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java
similarity index 72%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java
index 78101815a..b1a573bb3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSampler.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class RcaEnabledSampler implements ISampler {
     private final AppContext appContext;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java
index 6e74a0e8d..0424fc5f9 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplers.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
 
 public class RcaStateSamplers {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java
index e455a5b09..572d807c6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/FlowUnitOperationArgWrapper.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
 
 public class FlowUnitOperationArgWrapper {
     private final Node<?> node;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java
index c6cec8363..b7bf6bfe2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/GraphNodeOperations.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
 
 public class GraphNodeOperations {
     private static final Logger LOG = LogManager.getLogger(GraphNodeOperations.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java
index 8c9074714..12f4c5798 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCAScheduler.java
@@ -24,17 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.sql.SQLException;
@@ -48,6 +40,14 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
 
 /**
  * This is the top level class for the RCA Scheduler. This initializes all the required objects such
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java
index 5878effe4..bf580f795 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTask.java
@@ -24,22 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts.RcaTagConstants;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
+package org.opensearch.performanceanalyzer.rca.scheduler;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,6 +40,19 @@
 import java.util.concurrent.ExecutorService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts.RcaTagConstants;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
 
 public class RCASchedulerTask implements Runnable {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java
index 95c16e6fd..990f50c82 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerState.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 public enum RcaSchedulerState {
     STATE_NOT_STARTED,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java
index 14dc65d88..9540bc13d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/scheduler/Tasklet.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +37,12 @@
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.persistence.NetPersistor;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
 
 /**
  * This is a task abstraction on top of a Node in the Analysis framework. This is the smallest
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/README.md b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/README.md
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/README.md
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/README.md
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java
index 6a3022cd5..08ce698cf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/RcaStatsReporter.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats;
+package org.opensearch.performanceanalyzer.rca.stats;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 /**
  * This is meant to be the registry for all the stats that are collected by the Rca framework and
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
index cdf6e49ce..d7f8ad5cd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregator.java
@@ -24,22 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Count;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.IStatistic;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Mean;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Min;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.NamedCounter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Sample;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.Sum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+package org.opensearch.performanceanalyzer.rca.stats.collectors;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
@@ -52,6 +39,19 @@
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Count;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.IStatistic;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Max;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Mean;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Min;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.NamedCounter;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Sample;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.Sum;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.listeners.IListener;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 /**
  * This class is mainly to collect stats between runs of the RCA framework before we can write them
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java
index 187867e86..979ca8084 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/ISampler.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters;
+package org.opensearch.performanceanalyzer.rca.stats.emitters;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
 
 public interface ISampler {
     void sample(SampleAggregator sampleCollector);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java
index 5e2ab0c23..e1fdd7b77 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/emitters/PeriodicSamplers.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters;
+package org.opensearch.performanceanalyzer.rca.stats.emitters;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.List;
 import java.util.concurrent.CancellationException;
@@ -37,6 +36,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
 
 public class PeriodicSamplers implements Runnable {
     private static final Logger LOG = LogManager.getLogger(PeriodicSamplers.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java
index 0863c4e27..92796f06b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/Statistics.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval;
+package org.opensearch.performanceanalyzer.rca.stats.eval;
 
 /** List of stats that are currently supported. */
 public enum Statistics {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java
index 55d22ed14..5080ad554 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Count.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 
 public class Count implements IStatistic<AggregateValue> {
     private AtomicLong counter;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java
index 079203c6e..e71974fa8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/IStatistic.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
 import java.util.Collection;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
 
 /** This is the template of the statistic classes. Max, min etc. all follow this template. */
 public interface IStatistic<V extends Value> {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java
index fc4ae0d62..5e0fdd02b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Max.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 
 /** To get the maximum observed value */
 public class Max extends MinMaxCommon {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java
index 2aa884270..ccb697753 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Mean.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 
 public class Mean implements IStatistic<AggregateValue> {
     private BigInteger sum;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java
index 2722fb6d5..39924ca54 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Min.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 
 /** To get the minimum observed value. */
 public class Min extends MinMaxCommon {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java
index 3099db3cc..b05a9390b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/MinMaxCommon.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 
 /**
  * This is a utility class that is shares methods that are used for statistics where values are
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java
index f76c64214..9f612c615 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounter.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 
 public class NamedCounter implements IStatistic<NamedAggregateValue> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java
index e004fa133..9c40d0750 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sample.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
 
 public class Sample implements IStatistic<Value> {
     private Number value;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java
index a53b45dfc..ab4a749f4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/Sum.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
 
 public class Sum implements IStatistic<AggregateValue> {
     private AtomicLong sum;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java
index af64f9ccd..232cea37d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/AggregateValue.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class AggregateValue extends Value {
     private Statistics aggregationType;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java
index f81b29cd4..829747c96 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedAggregateValue.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class NamedAggregateValue extends AggregateValue {
     private String name;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java
index 92a89813d..76b7efa1c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/NamedValue.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
 
 
 import java.util.Objects;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java
index ed2801614..324e46f6e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/vals/Value.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.Formatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.format.Formatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class Value {
     protected Number value;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java
index b96602e21..e3645ded8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/DefaultFormatter.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format;
+package org.opensearch.performanceanalyzer.rca.stats.format;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class DefaultFormatter implements Formatter {
     private Map<MeasurementSet, Map<Statistics, List<Value>>> map;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/Formatter.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/Formatter.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/Formatter.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/Formatter.java
index d75dfc5d1..76143a6cb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/format/Formatter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/format/Formatter.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format;
+package org.opensearch.performanceanalyzer.rca.stats.format;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 /**
  * A formatter is used to get the final formatted output of an aggregation.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java
index ec8ca1908..625e5c93c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListener.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.listeners;
+package org.opensearch.performanceanalyzer.rca.stats.listeners;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 import java.util.Set;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 /**
  * This interface is implemented by the interested parties who want to to subscribe to the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java
index 00e1daa02..721e79f75 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSet.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements;
+package org.opensearch.performanceanalyzer.rca.stats.measurements;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 
 /** This is a marker interface to bring all measurement sets under one type. */
 public interface MeasurementSet {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java
similarity index 67%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java
index 76ca94921..04f6e3bb4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/AnalysisGraphTest.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store;
+package org.opensearch.performanceanalyzer.rca.store;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
 
 public class AnalysisGraphTest extends AnalysisGraph {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java
index f54ef08a2..762880321 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/OpenSearchAnalysisGraph.java
@@ -24,102 +24,102 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.AdmissionControlDecider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.CacheHealthDecider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.QueueHealthDecider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.HeapHealthDecider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.plugins.PluginController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.plugins.PluginControllerConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_CurrentValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_RejectionCount;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_ThresholdValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Bitset_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Query_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.DocValues_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotThroughput;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotalSyscallRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.IndexWriter_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Norms_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Points_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Segments_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.StoredFields_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.TermVectors_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Terms_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.VersionMap_Memory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigClusterCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.AvgCpuUtilByShardsMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.CpuUtilByShardsMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardAvgTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeAvgTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.HeapAllocRateTotalTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.ShardTotalDiskUsageTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.HeapAllocRateShardIndependentTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HotNodeRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControllerRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.FieldDataCacheRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.ShardRequestCacheRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hot_node.HighCpuRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageYoungGenRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.HighOldGenOccupancyRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.OldGenContendedRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.OldGenReclamationRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.threadpool.QueueRejectionRca;
+package org.opensearch.performanceanalyzer.rca.store;
+
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.AdmissionControlDecider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.CacheHealthDecider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.QueueHealthDecider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.HeapHealthDecider;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.plugins.PluginController;
+import org.opensearch.performanceanalyzer.plugins.PluginControllerConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_CurrentValue;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_RejectionCount;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.AdmissionControl_ThresholdValue;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Bitset_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Query_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.DocValues_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotThroughput;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotalSyscallRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.IndexWriter_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Norms_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Points_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Segments_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.StoredFields_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.TermVectors_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Terms_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.VersionMap_Memory;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigClusterCollector;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
+import org.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.AvgCpuUtilByShardsMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.CpuUtilByShardsMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardAvgTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeAvgTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.HeapAllocRateTotalTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.ShardTotalDiskUsageTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.HeapAllocRateShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.HotNodeRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControllerRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.FieldDataCacheRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.ShardRequestCacheRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hot_node.HighCpuRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageYoungGenRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.HighOldGenOccupancyRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.OldGenContendedRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.OldGenReclamationRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.NodeTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.threadpool.QueueRejectionRca;
 
 public class OpenSearchAnalysisGraph extends AnalysisGraph {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java
index d2589e88d..8dd170243 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCache.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector;
+package org.opensearch.performanceanalyzer.rca.store.collector;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * we create a thread-safe unbounded cache instance in {@link AppContext} to store the node config
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java
index 7c273ebeb..0d7c1fa3f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigClusterCollector.java
@@ -24,21 +24,21 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector;
+package org.opensearch.performanceanalyzer.rca.store.collector;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.EmptyFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.EmptyFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.NonLeafNode;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Cluster level node config collector that collect node config settings from each node and store
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java
index 6a3e0cc48..0aa16c8b3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/collector/NodeConfigCollector.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector;
+package org.opensearch.performanceanalyzer.rca.store.collector;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.OpenSearchConfigNode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.HashMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.OpenSearchConfigNode;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * This is a node level collector in RCA graph which collect the current config settings from
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java
index 43c5a172a..4fa6b2f20 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/AggregateMetric.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric;
+package org.opensearch.performanceanalyzer.rca.store.metric;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,6 +38,10 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
 
 /**
  * AggregateMetric can be used to group the sqlite to one or more columns and perform sum
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java
index 843c6489a..8ebdeed5e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/TemperatureMetricsBase.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
 import java.util.Arrays;
 import java.util.List;
 import org.jooq.DSLContext;
@@ -38,6 +34,10 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
 
 public abstract class TemperatureMetricsBase extends AggregateMetric {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java
index 0258944fb..c6f46ece5 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/AvgCpuUtilByShardsMetricBasedTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
 
 public class AvgCpuUtilByShardsMetricBasedTemperatureCalculator
         extends AvgShardBasedTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java
index 81168a9fb..24e88df2c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/CpuUtilByShardsMetricBasedTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
 
 public class CpuUtilByShardsMetricBasedTemperatureCalculator
         extends ShardBasedTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java
index 5a792ab6a..ae18200bb 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardAvgTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
 
 public class HeapAllocRateByShardAvgTemperatureCalculator
         extends AvgShardBasedTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java
index 269543a69..08c337f83 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/HeapAllocRateByShardTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
 
 public class HeapAllocRateByShardTemperatureCalculator extends ShardBasedTemperatureCalculator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java
index 2e3452a77..46710b16e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeAvgTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
 
 /** Class for returning the Average over the sizes of different Shards held by the node. */
 public class ShardSizeAvgTemperatureCalculator extends AvgShardBasedTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java
similarity index 77%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java
index e6ed65e0f..67bfe2da6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/ShardSizeMetricBasedTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
 
 /** Class for returning the Shard Size Metric for individual shards held by the node. */
 public class ShardSizeMetricBasedTemperatureCalculator extends ShardBasedTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java
index cd7e70872..d4ac70afa 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/AvgShardBasedTemperatureCalculator.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
 import java.util.List;
 import org.jooq.DSLContext;
 import org.jooq.Field;
@@ -35,6 +34,7 @@
 import org.jooq.Result;
 import org.jooq.SelectSeekStep1;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
 
 /**
  * This builds over the query from {@code SumOverOperationsForIndexShardGroup}. It calculates the
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java
index 2a6cdd1c9..9c2f9922a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/calculators/ShardBasedTemperatureCalculator.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 import java.util.List;
 import org.jooq.DSLContext;
 import org.jooq.Field;
@@ -37,6 +34,9 @@
 import org.jooq.Result;
 import org.jooq.SelectSeekStep1;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 
 /**
  * This class gets all rows for the given metric table where the shardID is not NULL. This is to
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java
index 4d558de64..32438aece 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/HeapAllocRateTotalTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
 
 public class HeapAllocRateTotalTemperatureCalculator extends TotalNodeTemperatureCalculator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java
index 13fe877f1..1121f7b03 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/ShardTotalDiskUsageTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
 
 /** This class calculated the total disk used by shards in the node. */
 public class ShardTotalDiskUsageTemperatureCalculator extends TotalNodeTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java
index 9900736b2..ef09f96a3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/TotalCpuUtilForTotalNodeMetric.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
 
 public class TotalCpuUtilForTotalNodeMetric extends TotalNodeTemperatureCalculator {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java
index 9eb505bb5..15f5eba6a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/capacity/calculators/TotalNodeTemperatureCalculator.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 import java.util.List;
 import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 
 /**
  * This class gets all rows for the given metric table where the shardID is not NULL. This is to
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java
index 362844d34..2e6411b16 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/DiskUsageShardIndependentTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
 
 public class DiskUsageShardIndependentTemperatureCalculator
         extends ShardIndependentTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java
index 0697db235..738bc85b4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/HeapAllocRateShardIndependentTemperatureCalculator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
 
 public class HeapAllocRateShardIndependentTemperatureCalculator
         extends ShardIndependentTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java
similarity index 75%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java
index c8c7334ac..e1d056925 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/ShardIndependentTemperatureCalculatorCpuUtilMetric.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
 
 public class ShardIndependentTemperatureCalculatorCpuUtilMetric
         extends ShardIndependentTemperatureCalculator {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java
index 02046044f..1abc94d87 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/shardIndependent/calculators/ShardIndependentTemperatureCalculator.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,6 +35,9 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
 
 /**
  * Even in metrics that has ShardId dimension, it can be null for some rows. For examples here:
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java
index ad9f37564..a852c244c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HighHeapUsageClusterRca.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca;
+package org.opensearch.performanceanalyzer.rca.store.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -51,6 +39,18 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This RCA runs on the elected master only and it subscribes all high heap RCA from data nodes
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java
index c60033f3f..8456f2101 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeClusterRca.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca;
+package org.opensearch.performanceanalyzer.rca.store.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Table;
@@ -53,6 +41,18 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class HotNodeClusterRca extends Rca<ResourceFlowUnit<HotClusterSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java
index 6ad3a29de..b8d9615de 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/HotNodeRca.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca;
+package org.opensearch.performanceanalyzer.rca.store.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class HotNodeRca extends Rca<ResourceFlowUnit<HotNodeSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java
index bcbb04fdc..7be573128 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/OldGenRca.java
@@ -24,20 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca;
+package org.opensearch.performanceanalyzer.rca.store.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
@@ -45,6 +34,17 @@
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
 
 public abstract class OldGenRca<T extends ResourceFlowUnit<?>> extends Rca<T> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java
similarity index 73%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java
index 10e27c459..913769e37 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControlClusterRca.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control;
+package org.opensearch.performanceanalyzer.rca.store.rca.admission_control;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
 
 public class AdmissionControlClusterRca extends BaseClusterRca {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java
index cf244d0ad..9e8b278d7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/admission_control/AdmissionControllerRca.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.store.rca.admission_control;
+
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class AdmissionControllerRca extends Rca<ResourceFlowUnit<HotNodeSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java
similarity index 87%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java
index 44d97b328..2c30a1b4b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/CacheUtil.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache;
+package org.opensearch.performanceanalyzer.rca.store.rca.cache;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class CacheUtil {
     private static final Logger LOG = LogManager.getLogger(CacheUtil.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
index 385dc3889..7bd9da2a4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/FieldDataCacheRca.java
@@ -24,30 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache;
-
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.getCacheMaxSize;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.isSizeThresholdExceeded;
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+package org.opensearch.performanceanalyzer.rca.store.rca.cache;
+
+import static org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.getCacheMaxSize;
+import static org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.isSizeThresholdExceeded;
+
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -55,6 +36,25 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Field Data Cache RCA is to identify when the cache is unhealthy(thrashing) and otherwise,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
index 8c6556275..19b2ebf40 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cache/ShardRequestCacheRca.java
@@ -24,30 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache;
+package org.opensearch.performanceanalyzer.rca.store.rca.cache;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.getCacheMaxSize;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.isSizeThresholdExceeded;
+import static org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.getCacheMaxSize;
+import static org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil.isSizeThresholdExceeded;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -57,6 +38,25 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 /**
  * Shard Request Cache RCA is to identify when the cache is unhealthy(thrashing) and otherwise,
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java
index b211a0b71..b844b7e66 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/BaseClusterRca.java
@@ -24,19 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster;
+package org.opensearch.performanceanalyzer.rca.store.rca.cluster;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
@@ -50,6 +40,16 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This is a generic cluster level RCA which subscripts upstream node level RCAs and generate a
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java
index 8e65fc52a..ab1862b97 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/FieldDataCacheClusterRca.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster;
+package org.opensearch.performanceanalyzer.rca.store.rca.cluster;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
 
 public class FieldDataCacheClusterRca extends BaseClusterRca {
     public static final String RCA_TABLE_NAME = FieldDataCacheClusterRca.class.getSimpleName();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java
index ff4f1bbc6..009f1545f 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/NodeKey.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster;
+package org.opensearch.performanceanalyzer.rca.store.rca.cluster;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class NodeKey {
     private final InstanceDetails.Id nodeId;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java
index 70b127865..38e652b26 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/QueueRejectionClusterRca.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster;
+package org.opensearch.performanceanalyzer.rca.store.rca.cluster;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
 
 public class QueueRejectionClusterRca extends BaseClusterRca {
     public static final String RCA_TABLE_NAME = QueueRejectionClusterRca.class.getSimpleName();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java
similarity index 76%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java
index 1657d943c..2ca9865a2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/cluster/ShardRequestCacheClusterRca.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster;
+package org.opensearch.performanceanalyzer.rca.store.rca.cluster;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
 
 public class ShardRequestCacheClusterRca extends BaseClusterRca {
     public static final String RCA_TABLE_NAME = ShardRequestCacheClusterRca.class.getSimpleName();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java
index 1288cbcf9..bec3b5d11 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/GenericResourceRca.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hot_node;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.store.rca.hot_node;
+
+
 import java.time.Clock;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -47,6 +35,18 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.exception.DataTypeException;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * Generic resource type RCA. ideally this RCA can be extended to any resource type and calculate
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java
similarity index 84%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java
index f5edd18ba..84f29558a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hot_node/HighCpuRca.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hot_node;
+package org.opensearch.performanceanalyzer.rca.store.rca.hot_node;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
 
 /**
  * This RCA can be used to calculate total cpu usage(combines all physical cores) and give a list of
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java
similarity index 86%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java
index 6988a876c..339759a59 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageOldGenRca.java
@@ -24,30 +24,30 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotheap;
+
+
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
 
 /**
  * This RCA is used to decide whether the old generation in JVM garbage collector is healthy or not.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java
index 8bf5b442a..958648756 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/HighHeapUsageYoungGenRca.java
@@ -24,27 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotheap;
+
+
 import java.time.Clock;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -53,6 +35,24 @@
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaVerticesMetrics;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This RCA is used to decide whether the young generation in CMS garbage collector is healthy or
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java
index dc8ef1711..3718a5fe2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotheap/NodeStatAggregator.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotheap;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
@@ -38,6 +34,10 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 
 /**
  * We've seen huge performance impact if collecting node stats across all shards on data node. So
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java
similarity index 89%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java
index 0970d6b5a..da3e8da99 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardClusterRca.java
@@ -24,24 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotshard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotShardClusterRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 import java.util.ArrayList;
@@ -52,6 +37,21 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.configs.HotShardClusterRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This RCA is used to find hot shards per index in a cluster using the HotShardSummary sent from
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java
index 703bdad12..742bfb6a0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/HotShardRca.java
@@ -24,28 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotshard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotShardRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -56,6 +37,25 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.configs.HotShardRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This RCA is to identify a hot shard within an index. A Hot shard is an outlier within its
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java
index 049a5af09..a661c7ea0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/IndexShardKey.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotshard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.exception.DataTypeException;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class IndexShardKey {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java
index 45cf1253c..b3d7c9778 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/hotshard/NodeShardKey.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard;
+package org.opensearch.performanceanalyzer.rca.store.rca.hotshard;
 
 public class NodeShardKey {
     private final String nodeId;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java
index 1e439d98f..b61115146 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRca.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighOldGenOccupancyRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+
+
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.rca.configs.HighOldGenOccupancyRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
 
 public class HighOldGenOccupancyRca extends OldGenRca<ResourceFlowUnit<HotResourceSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java
similarity index 80%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java
index 783a66c0e..26454fc13 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRca.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class LargeHeapClusterRca extends Rca<ResourceFlowUnit<HotClusterSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java
similarity index 81%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java
index 64db1a973..c3bc063fe 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRca.java
@@ -24,27 +24,27 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.OldGenContendedRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.util.MemInfoParser;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+
+
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.configs.OldGenContendedRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.util.MemInfoParser;
 
 public class OldGenContendedRca extends Rca<ResourceFlowUnit<HotNodeSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java
index 60381b8c5..fad1bb4ad 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRca.java
@@ -24,21 +24,21 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
 import java.util.concurrent.TimeUnit;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindow;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.OldGenRca;
 
 public class OldGenReclamationRca extends OldGenRca<ResourceFlowUnit<HotResourceSummary>> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java
index ebc340865..301000eb2 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/ClusterTemperatureRca.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.ClusterTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.CompactNodeTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactClusterLevelNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature;
+
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.ClusterTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.CompactNodeTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactClusterLevelNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class ClusterTemperatureRca extends Rca<ClusterTemperatureFlowUnit> {
     private final NodeTemperatureRca nodeTemperatureRca;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java
index 9438614b9..5d546646a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/DimensionalTemperatureCalculator.java
@@ -24,23 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -48,6 +34,20 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ShardProfileSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.AvgShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.calculators.ShardBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.calculators.TotalNodeTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.calculators.ShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 
 public class DimensionalTemperatureCalculator {
     private static final Logger LOG = LogManager.getLogger(DimensionalTemperatureCalculator.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java
similarity index 78%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java
index 6cb6acee1..cdd797891 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/NodeTemperatureRca.java
@@ -24,28 +24,28 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.CompactNodeTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.FullNodeTemperatureSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.CompactNodeTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.FullNodeTemperatureSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.CpuUtilDimensionTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.HeapAllocRateTemperatureRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension.ShardSizeDimensionTemperatureRca;
 
 public class NodeTemperatureRca extends Rca<CompactNodeTemperatureFlowUnit> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java
similarity index 70%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java
index 4c3c7c507..6961010f7 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/CpuUtilDimensionTemperatureRca.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.AvgCpuUtilByShardsMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.CpuUtilByShardsMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.AvgCpuUtilByShardsMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.CpuUtilByShardsMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 
 public class CpuUtilDimensionTemperatureRca extends Rca<DimensionalTemperatureFlowUnit> {
     private static final Logger LOG = LogManager.getLogger(CpuUtilDimensionTemperatureRca.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java
similarity index 73%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java
index 422c7a531..521e08e5d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/HeapAllocRateTemperatureRca.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardAvgTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.HeapAllocRateTotalTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.HeapAllocRateShardIndependentTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardAvgTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.HeapAllocRateByShardTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.HeapAllocRateTotalTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.HeapAllocRateShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 
 public class HeapAllocRateTemperatureRca extends Rca<DimensionalTemperatureFlowUnit> {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java
similarity index 71%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java
index 1f184df3f..aafb52445 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/dimension/ShardSizeDimensionTemperatureRca.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
+package org.opensearch.performanceanalyzer.rca.store.rca.temperature.dimension;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeAvgTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeMetricBasedTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.ShardTotalDiskUsageTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.DiskUsageShardIndependentTemperatureCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.temperature.DimensionalTemperatureFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.ShardStore;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeAvgTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard.ShardSizeMetricBasedTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.ShardTotalDiskUsageTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.DiskUsageShardIndependentTemperatureCalculator;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.DimensionalTemperatureCalculator;
 
 /*
  *Returns the shard size based heat of an individual node.
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/temperatureRcas.png b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/temperatureRcas.png
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/temperature/temperatureRcas.png
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/temperatureRcas.png
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java
similarity index 83%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java
index e542e3aa1..3c7575065 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/threadpool/QueueRejectionRca.java
@@ -24,27 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.threadpool;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.QueueRejectionRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.store.rca.threadpool;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -54,6 +36,24 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.configs.QueueRejectionRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.persist.SQLParsingUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 /**
  * This RCA reads ThreadPool_RejectionReqs from upstream metrics and maintain collectors for each
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java
similarity index 82%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java
index ba456a5b0..d8baf871a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/util/NodeConfigCacheReaderUtil.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.util;
+package org.opensearch.performanceanalyzer.rca.store.rca.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.grpc.MetricEnum;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class NodeConfigCacheReaderUtil {
     private static final Logger LOG = LogManager.getLogger(NodeConfigCacheReaderUtil.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/example_threshold.json b/src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/example_threshold.json
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/example_threshold.json
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/example_threshold.json
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/high-cpu-tolerance.json b/src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/high-cpu-tolerance.json
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/high-cpu-tolerance.json
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/high-cpu-tolerance.json
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/high-cpu.json b/src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/high-cpu.json
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/threshold/high-cpu.json
rename to src/main/java/org/opensearch/performanceanalyzer/rca/store/threshold/high-cpu.json
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/todo.md b/src/main/java/org/opensearch/performanceanalyzer/rca/todo.md
similarity index 100%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/todo.md
rename to src/main/java/org/opensearch/performanceanalyzer/rca/todo.md
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtils.java b/src/main/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtils.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtils.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtils.java
index 17a1bca2d..71d18c875 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtils.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtils.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.util;
+package org.opensearch.performanceanalyzer.rca.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 /** Utility class to get details about the nodes in the cluster. */
 public class ClusterUtils {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/MemInfoParser.java b/src/main/java/org/opensearch/performanceanalyzer/rca/util/MemInfoParser.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/MemInfoParser.java
rename to src/main/java/org/opensearch/performanceanalyzer/rca/util/MemInfoParser.java
index acbff5434..bcb724215 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/MemInfoParser.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rca/util/MemInfoParser.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.util;
+package org.opensearch.performanceanalyzer.rca.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
 
 public class MemInfoParser {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java
similarity index 91%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java
index b0ff05240..05941a762 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessor.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
 import java.sql.Connection;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.NavigableMap;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class AdmissionControlProcessor implements EventProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java
index 8dafe074f..e25d286ae 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshot.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +37,7 @@
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class AdmissionControlSnapshot implements Removable {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java
index b7f2905be..f907484ed 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessor.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaControllerHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,6 +38,13 @@
 import javax.annotation.Nullable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.rca.RcaControllerHelper;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class ClusterDetailsEventProcessor implements EventProcessor {
     private static final Logger LOG = LogManager.getLogger(ClusterDetailsEventProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventDispatcher.java b/src/main/java/org/opensearch/performanceanalyzer/reader/EventDispatcher.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventDispatcher.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/EventDispatcher.java
index 9581e0846..c8a066e56 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventDispatcher.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/EventDispatcher.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class EventDispatcher {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/EventProcessor.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/EventProcessor.java
index 89a32dfba..b9a71b07b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/EventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/EventProcessor.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public interface EventProcessor {
     int BATCH_LIMIT = 500;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java
index 8c158e615..50cdb5ab3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsProcessor.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.sql.Connection;
 import java.util.Map;
@@ -39,6 +34,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class FaultDetectionMetricsProcessor implements EventProcessor {
     private static final Logger LOG = LogManager.getLogger(FaultDetectionMetricsProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java
index 49f219c6f..236665e2b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshot.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import com.google.common.annotations.VisibleForTesting;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -47,6 +44,9 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public class FaultDetectionMetricsSnapshot implements Removable {
     private static final Logger LOG = LogManager.getLogger(FaultDetectionMetricsSnapshot.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FileHandler.java b/src/main/java/org/opensearch/performanceanalyzer/reader/FileHandler.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FileHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/FileHandler.java
index a7cfe223a..183b17e8d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FileHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/FileHandler.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.IOException;
@@ -37,6 +35,8 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public abstract class FileHandler {
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java
index c30fc7af7..8e1f55b07 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessor.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
 import java.sql.Connection;
 import java.util.Map;
 import java.util.NavigableMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class GarbageCollectorInfoProcessor implements EventProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java
index a1409110f..f940d4a7b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshot.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +39,7 @@
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class GarbageCollectorInfoSnapshot implements Removable {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java
index ab8e0976c..cad0c1124 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestEventProcessor.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.sql.Connection;
 import java.util.Map;
@@ -39,6 +34,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class HttpRequestEventProcessor implements EventProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java
index 664dd2855..b605e5c8e 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/HttpRequestMetricsSnapshot.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,6 +43,9 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 /**
  * Snapshot of start/end events generated by customer initiated http operations like bulk and
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java
index 683bd4935..9a7c992a3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshot.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +41,10 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public class MasterEventMetricsSnapshot implements Removable {
     private static final Logger LOG = LogManager.getLogger(MasterEventMetricsSnapshot.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java
index efb5590be..929f6dbc4 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterMetricsEventProcessor.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.sql.Connection;
 import java.util.Map;
@@ -37,6 +34,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class MasterMetricsEventProcessor implements EventProcessor {
     private static final Logger LOG = LogManager.getLogger(MasterMetricsEventProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java
index d7904dfb1..9171ef164 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsEventProcessor.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -40,6 +37,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class MasterThrottlingMetricsEventProcessor implements EventProcessor {
     private static final Logger LOG =
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java
index f2f8226f7..6b0ec8ff3 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshot.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import com.google.common.annotations.VisibleForTesting;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -44,6 +41,9 @@
 import org.jooq.SQLDialect;
 import org.jooq.SelectField;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public class MasterThrottlingMetricsSnapshot implements Removable {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java
index 703b61722..480f11d30 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshot.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -49,6 +47,8 @@
 import org.jooq.SelectHavingStep;
 import org.jooq.SelectJoinStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class MemoryDBSnapshot implements Removable {
     private static final Logger LOG = LogManager.getLogger(MemoryDBSnapshot.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricProperties.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricProperties.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricProperties.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MetricProperties.java
index f40f52dfc..937cf369a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricProperties.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricProperties.java
@@ -24,19 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonPathNotFoundException;
+package org.opensearch.performanceanalyzer.reader;
+
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedReader;
@@ -56,6 +46,16 @@
 import org.jooq.Condition;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.MetricDimension;
+import org.opensearch.performanceanalyzer.metrics.MetricValue;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
+import org.opensearch.performanceanalyzer.util.JsonPathNotFoundException;
 
 public class MetricProperties {
     private static final Logger LOG = LogManager.getLogger(MetricProperties.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java
similarity index 85%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java
index b6591ce98..7a4a173f0 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfig.java
@@ -24,36 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ElectionTermValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MetricName;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsDerivedDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.util.ArrayList;
@@ -62,6 +35,33 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.AdmissionControlValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DevicePartitionValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.DiskValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ElectionTermValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.HeapValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.IPValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MetricName;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsDerivedDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ShardStatsValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.TCPValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.ThreadPoolValue;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public final class MetricPropertiesConfig {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitter.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitter.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java
index b8641bd3d..667d035fe 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.TroubleshootingConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Dimensions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+package org.opensearch.performanceanalyzer.reader;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -54,6 +45,15 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.config.TroubleshootingConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.Dimensions;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
 
 @SuppressWarnings("serial")
 public class MetricsEmitter {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java
index 3a60e95c8..2ba48a30c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/NodeMetricsEventProcessor.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonPathNotFoundException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.File;
 import java.io.IOException;
@@ -44,6 +37,13 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
+import org.opensearch.performanceanalyzer.util.JsonPathNotFoundException;
 
 public class NodeMetricsEventProcessor implements EventProcessor {
     private static final Logger LOG = LogManager.getLogger(NodeMetricsEventProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/OSEventProcessor.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/OSEventProcessor.java
index 77c7278a0..0a7531c94 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/OSEventProcessor.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.OSMetricsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -42,6 +38,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.collectors.OSMetricsCollector;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class OSEventProcessor implements EventProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java
similarity index 99%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java
index 61b54d3c0..b3341063c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshot.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,6 +47,7 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 @SuppressWarnings("serial")
 public class OSMetricsSnapshot implements Removable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java
index 54d695148..ece38d803 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessor.java
@@ -24,23 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLog;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler;
+package org.opensearch.performanceanalyzer.reader;
+
+
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.IOException;
@@ -67,6 +53,20 @@
 import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.EventLog;
+import org.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler;
 
 public class ReaderMetricsProcessor implements Runnable {
     private static final Logger LOG = LogManager.getLogger(ReaderMetricsProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/Removable.java b/src/main/java/org/opensearch/performanceanalyzer/reader/Removable.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/Removable.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/Removable.java
index e83d6a799..8c76e8f4b 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/Removable.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/Removable.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 /** Interface that should be implemented by snapshot holders that need to be trimmed. */
 public interface Removable {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/RequestEventProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/RequestEventProcessor.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/RequestEventProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/RequestEventProcessor.java
index 3c346051c..631672493 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/RequestEventProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/RequestEventProcessor.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.io.File;
 import java.sql.Connection;
 import java.util.Map;
@@ -37,6 +34,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class RequestEventProcessor implements EventProcessor {
 
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java
similarity index 98%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java
index b3ef19dd9..91d887913 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardRequestMetricsSnapshot.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.DBUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,6 +45,10 @@
 import org.jooq.SelectField;
 import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.DBUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 /** Snapshot of start/end events generated by per shard operations like shardBulk/shardSearch. */
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java
index 937ff08e8..3e0bcb353 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsProcessor.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -41,6 +38,9 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.BatchBindStep;
 import org.jooq.tools.StringUtils;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class ShardStateMetricsProcessor implements EventProcessor {
     private static final Logger LOG = LogManager.getLogger(ShardStateMetricsProcessor.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java
index 999e0848e..157fd912a 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshot.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import com.google.common.annotations.VisibleForTesting;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -43,6 +42,7 @@
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class ShardStateMetricsSnapshot implements Removable {
     private static final Logger LOG = LogManager.getLogger(ShardStateMetricsSnapshot.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/Event.java b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/Event.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/Event.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/Event.java
index 88ae040d8..bcd12b411 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/Event.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/Event.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared;
+package org.opensearch.performanceanalyzer.reader_writer_shared;
 
 public class Event {
     public String key;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java
similarity index 97%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java
index 8dc2a1930..3ea77dd03 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLog.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared;
+package org.opensearch.performanceanalyzer.reader_writer_shared;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.EventDispatcher;
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.file.Paths;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.reader.EventDispatcher;
 
 /**
  * This is a serializer - de-serializer class. This is used by the PerformancecAnalyzer Plugin to
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
similarity index 96%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
index 13fd95981..b83285b74 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
@@ -24,13 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared;
+package org.opensearch.performanceanalyzer.reader_writer_shared;
 
 import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.EventDispatcher;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -44,6 +42,8 @@
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.reader.EventDispatcher;
 
 public class EventLogFileHandler {
     private static final Logger LOG = LogManager.getLogger(EventLogFileHandler.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/MetricsHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rest/MetricsHandler.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/MetricsHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rest/MetricsHandler.java
index 1b1903304..267808c3c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/MetricsHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rest/MetricsHandler.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
+package org.opensearch.performanceanalyzer.rest;
 
 
 import java.util.HashMap;
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java
index 52e00dfa4..7d53ac7ef 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryActionRequestHandler.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
+package org.opensearch.performanceanalyzer.rest;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -46,6 +42,10 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 /**
  * Request Handler that supports querying the latest action set
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java
index da1b43db7..ad80b1acf 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandler.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
+package org.opensearch.performanceanalyzer.rest;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.model.MetricsModel;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
@@ -55,6 +46,15 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.exception.DataAccessException;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.model.MetricsModel;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 /**
  * Request handler that supports querying batch metrics from an EC2 instance
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java
similarity index 92%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java
index 4fd3aeb2a..6acc68690 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandler.java
@@ -24,23 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.model.MetricAttributes;
-import com.amazon.opendistro.opensearch.performanceanalyzer.model.MetricsModel;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
+package org.opensearch.performanceanalyzer.rest;
+
+
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import io.grpc.stub.StreamObserver;
@@ -60,6 +46,20 @@
 import org.apache.logging.log4j.util.Supplier;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.model.MetricAttributes;
+import org.opensearch.performanceanalyzer.model.MetricsModel;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 /**
  * Request handler that supports querying MetricsDB on every EC2 instance. Example query –
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java
similarity index 94%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java
rename to src/main/java/org/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java
index adb383244..f7b491bdd 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/rest/QueryRcaRequestHandler.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
+package org.opensearch.performanceanalyzer.rest;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.Version;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -49,6 +42,13 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.rca.Version;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
 
 /**
  * Request handler that supports querying RCAs
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/ThreadProvider.java b/src/main/java/org/opensearch/performanceanalyzer/threads/ThreadProvider.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/ThreadProvider.java
rename to src/main/java/org/opensearch/performanceanalyzer/threads/ThreadProvider.java
index 2250bed1f..4557d2a0d 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/ThreadProvider.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/threads/ThreadProvider.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.threads;
+package org.opensearch.performanceanalyzer.threads;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
 
 /** Class that wraps a given runnable in a thread with exception handling capabilities. */
 public class ThreadProvider {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java b/src/main/java/org/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java
similarity index 88%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java
rename to src/main/java/org/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java
index c4d7ce2af..8c515e894 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/threads/exceptions/PAThreadException.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.threads.exceptions;
+package org.opensearch.performanceanalyzer.threads.exceptions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
 
 /** Exception that is thrown when one of the PA threads run into an unhandled exception. */
 public class PAThreadException extends Exception {
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/FileHelper.java b/src/main/java/org/opensearch/performanceanalyzer/util/FileHelper.java
similarity index 90%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/FileHelper.java
rename to src/main/java/org/opensearch/performanceanalyzer/util/FileHelper.java
index 7409f1729..3b606b95c 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/FileHelper.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/util/FileHelper.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 public class FileHelper {
     private static final Logger log = LogManager.getLogger(FileHelper.class);
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonConverter.java b/src/main/java/org/opensearch/performanceanalyzer/util/JsonConverter.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonConverter.java
rename to src/main/java/org/opensearch/performanceanalyzer/util/JsonConverter.java
index a2930d589..f6b635884 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonConverter.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/util/JsonConverter.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -40,6 +38,8 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
 
 public class JsonConverter {
     private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java b/src/main/java/org/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java
similarity index 93%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java
rename to src/main/java/org/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java
index 8b1f2e42d..9328737b8 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/util/JsonPathNotFoundException.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 public class JsonPathNotFoundException extends Exception {
     public JsonPathNotFoundException() {}
diff --git a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SuppressFBWarnings.java b/src/main/java/org/opensearch/performanceanalyzer/util/SuppressFBWarnings.java
similarity index 95%
rename from src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SuppressFBWarnings.java
rename to src/main/java/org/opensearch/performanceanalyzer/util/SuppressFBWarnings.java
index 12e15361c..960c58ec6 100644
--- a/src/main/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SuppressFBWarnings.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/util/SuppressFBWarnings.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 
 import java.lang.annotation.Retention;
diff --git a/src/main/proto/inter_node_rpc_service.proto b/src/main/proto/inter_node_rpc_service.proto
index 99275fc2f..e014a8cc6 100644
--- a/src/main/proto/inter_node_rpc_service.proto
+++ b/src/main/proto/inter_node_rpc_service.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "com.amazon.opendistro.opensearch.performanceanalyzer.grpc";
+option java_package = "org.opensearch.performanceanalyzer.grpc";
 option java_outer_classname = "PANetworking";
 
 import "google/protobuf/descriptor.proto";
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.grpc;
+package org.opensearch.performanceanalyzer.grpc;
 
 service InterNodeRpcService {
     // Sends a flowunit to whoever is interested in it.
diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties
index a8d42e5ad..334b78350 100644
--- a/src/main/resources/plugin-descriptor.properties
+++ b/src/main/resources/plugin-descriptor.properties
@@ -27,13 +27,13 @@
 description=Performance Analyzer Plugin
 #
 # 'version': plugin's version
-version=7.10.3
+version=1.0.0.0-beta1
 #
 # 'name': the plugin name
 name=performance-analyzer
 #
 # 'classname': the name of the class to load, fully-qualified.
-classname=com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
+classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
 #
 # 'java.version' version of java the code is built against
 # use the system property java.specification.version
@@ -42,4 +42,4 @@ classname=com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyz
 java.version=1.8
 #
 # 'opensearch.version' version of openSearch compiled against
-opensearch.version=7.10.3
+opensearch.version=1.0.0-beta1
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/AbstractTests.java b/src/test/java/org/opensearch/performanceanalyzer/AbstractTests.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/AbstractTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/AbstractTests.java
index cd0dbf3d3..e1dd2d0fa 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/AbstractTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/AbstractTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
 import java.io.File;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java b/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java
rename to src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java
index 286a445cd..3c6226690 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.junit.Before;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
 
 public class CustomMetricsLocationTestBase {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java
index 58bf740da..22ef98b88 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerAppTest.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
 
 public class PerformanceAnalyzerAppTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
similarity index 99%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
index 434e942fb..6e21e3e6e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer;
+package org.opensearch.performanceanalyzer;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
 import com.sun.net.httpserver.HttpServer;
 import io.grpc.netty.shaded.io.netty.handler.codec.http.HttpResponseStatus;
 import java.io.BufferedReader;
@@ -48,6 +47,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
 
 public class PerformanceAnalyzerWebServerTest {
     private static final String BIND_HOST = "localhost";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java b/src/test/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java
index ddae341bc..94f4ca4bd 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSetTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collections;
+package org.opensearch.performanceanalyzer.collections;
 
 
 import java.util.HashSet;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java
index 392192b1d..4e004438b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/AbstractCollectorTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.time.Instant;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 /** A base class that others can extend to validate their Metrics Collectors behavior */
 public abstract class AbstractCollectorTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java
index 199ad2447..74c8e20e2 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/DisksCollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java
index a42e9335a..81375aae5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java
index a6a1666c8..c645ddb83 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java
index d3870aea9..c8e9d83ea 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/MountedPartitionMetricsCollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java
index e9246e700..001ba5f0d 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkE2ECollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.apache.logging.log4j.LogManager;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java
index 5631df397..96d84d1c7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
+package org.opensearch.performanceanalyzer.collectors;
 
 
 import org.junit.Before;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java
similarity index 71%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java
index 9298b775e..d82e5aebe 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/RcaStatsCollectorTest.java
@@ -24,33 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.collectors;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Symptom;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+package org.opensearch.performanceanalyzer.collectors;
+
+
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
@@ -61,6 +37,30 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Symptom;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.JvmMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaGraphMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class RcaStatsCollectorTest {
     class FaultyAnalysisGraph extends AnalysisGraph {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java b/src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java
index b4cf88031..9db704a82 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplierTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
@@ -49,6 +46,9 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.RcaController;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class ConfigOverridesApplierTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java b/src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java
index c98b434a3..cd7f774e1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesHelperTests.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides;
+package org.opensearch.performanceanalyzer.config.overrides;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class ConfigOverridesHelperTests {
     private ConfigOverridesWrapper testConfigOverridesWrapper;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java
index 526b42a9b..071054865 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/CacheClearActionTest.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -41,6 +36,11 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class CacheClearActionTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java
index e3702cada..820950d78 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseActionTest.java
@@ -24,16 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.util.Collections;
@@ -46,6 +43,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java
index 124d20918..e68ae411b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVectorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 
 import java.util.Map;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java
index 0a3b9ed6d..fa537cd3a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeActionTest.java
@@ -24,28 +24,28 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.collect.ImmutableSet;
 import java.nio.file.Paths;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class ModifyCacheMaxSizeActionTest {
     private final long heapMaxSizeInBytes = 32 * CacheUtil.GB_TO_BYTES;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java
index e869da768..475d08520 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityActionTest.java
@@ -24,25 +24,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.collect.ImmutableSet;
 import java.nio.file.Paths;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class ModifyQueueCapacityActionTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java
index ab9d9c907..2cdf1d64a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetectorTest.java
@@ -24,12 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions;
+package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
 import static org.mockito.Mockito.when;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -38,6 +36,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class TimedFlipFlopDetectorTest {
     private TimedFlipFlopDetector flipFlopDetector;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java
index 8ebc7121a..202c789a5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class CacheActionConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java
index 300149e19..55ee0ce14 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class QueueActionConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java
similarity index 74%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java
index 8bd86d53e..6909c12b5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/AdmissionControlDeciderTest.java
@@ -24,29 +24,29 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
+
+
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.core.util.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.rca.admission_control.AdmissionControlClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class AdmissionControlDeciderTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java
index 39382a324..32b862292 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDeciderTest.java
@@ -24,28 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.nio.file.Paths;
@@ -56,6 +40,22 @@
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class CacheHealthDeciderTest {
     private static final JsonParser JSON_PARSER = new JsonParser();
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java
index 924a46750..7e58bfbbc 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDeciderTest.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class HeapBasedDeciderTest {
     private HeapBasedDecider createClusterRcaWithOldGenVal(double oldGenValue, NodeKey nodeKey) {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java
index b70f81faa..2acf16ac3 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/PublisherTest.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.plugins.Plugin;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
+
+
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.HashMap;
@@ -46,6 +37,15 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.collator.Collator;
+import org.opensearch.performanceanalyzer.plugins.Plugin;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class PublisherTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java
index 0531fad2c..75ab28904 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDeciderTest.java
@@ -24,27 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.nio.file.Paths;
@@ -54,6 +39,21 @@
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class QueueHealthDeciderTest {
     private static final JsonParser JSON_PARSER = new JsonParser();
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java
index 4da4ecb70..793135f3a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/CollatorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -33,12 +33,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,6 +43,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decider;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Decision;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class CollatorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java
index a7fc1d532..ec6abe5e4 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessorTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
 import static org.junit.Assert.assertFalse;
 import static org.mockito.ArgumentMatchers.any;
@@ -34,15 +34,15 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class ImpactAssessorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java
index 5cd852df6..8873dd183 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class CachePriorityOrderConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java
index c383b889f..729d7c740 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfigTest.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class WorkLoadTypeConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java
index 1ac7dc40a..27491665f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class LevelOneActionBuilderConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java
index e6a7110b3..156c10fe4 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class LevelThreeActionBuilderConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java
index b3a5c20d9..ef8392846 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class LevelTwoActionBuilderConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java
index 943877712..1f7f806b2 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfigTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 public class OldGenDecisionPolicyConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java
index e112d5ac5..00cbb55b8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmActionsAlarmMonitorTest.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.AlarmMonitor;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.SlidingWindowData;
 
 public class JvmActionsAlarmMonitorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java
index 58d8f8434..0c8c72f70 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/JvmGenTuningPolicyTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -34,22 +34,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Assert;
@@ -57,6 +41,22 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
 
 public class JvmGenTuningPolicyTest {
     private JvmGenTuningPolicy policy;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java
index 673d9f633..3c54639b0 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelOneActionBuilderTest.java
@@ -24,27 +24,27 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelOneActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelOneActionBuilder;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelOneActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelOneActionBuilder;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class LevelOneActionBuilderTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java
index 3563c4686..bb699cfdd 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelThreeActionBuilderTest.java
@@ -24,33 +24,33 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelThreeActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelThreeActionBuilder;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelThreeActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelThreeActionBuilder;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class LevelThreeActionBuilderTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java
index bf23b599e..885048e98 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/LevelTwoActionBuilderTest.java
@@ -24,30 +24,30 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelTwoActionBuilderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelTwoActionBuilder;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import java.util.List;
 import java.util.Random;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.CacheActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.LevelTwoActionBuilderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.old_gen.LevelTwoActionBuilder;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils.DeciderActionParserUtil;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class LevelTwoActionBuilderTest {
     private AppContext testAppContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java
index a5219b2db..c76384f31 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/jvm/sizing/HeapSizeIncreasePolicyTest.java
@@ -24,25 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.sizing;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -53,6 +41,18 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.rca.configs.HeapSizeIncreasePolicyConfig;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing.LargeHeapClusterRca;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java
rename to src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java
index 7cfa0791b..896a05166 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/test_utils/DeciderActionParserUtil.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils;
+package org.opensearch.performanceanalyzer.decisionmaker.deciders.test_utils;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 public class DeciderActionParserUtil {
     private final Map<ResourceEnum, ModifyCacheMaxSizeAction> cacheActionMap;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/jvm/GCMetricsTests.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetricsTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/jvm/GCMetricsTests.java
index 738d74862..5eef25b6e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/GCMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/jvm/GCMetricsTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
 import org.junit.Test;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java
index d79944f56..085af364f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/jvm/HeapMetricsTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
 import java.lang.management.MemoryUsage;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTest.java b/src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTest.java
index d803164e7..5bb172a61 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTest.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatExceptionCode;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
 import java.lang.management.ThreadInfo;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.OSMetricsGeneratorFactory;
+import org.opensearch.performanceanalyzer.collectors.StatExceptionCode;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
 
 // This test only runs in linux systems as the some of the static members of the ThreadList
 // class are specific to Linux.
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTests.java b/src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTests.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTests.java
index b26133423..83ac5d580 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/jvm/ThreadListTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/jvm/ThreadListTests.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.jvm;
+package org.opensearch.performanceanalyzer.jvm;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface;
-import com.amazon.opendistro.opensearch.performanceanalyzer.os.OSGlobals;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.hwnet.NetworkInterface;
+import org.opensearch.performanceanalyzer.os.OSGlobals;
 
 public class ThreadListTests {
     // XXX: standalone test code
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java
index ae0018e04..e7e96f420 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/metrics/PerformanceAnalyzerMetricsTests.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metrics;
+package org.opensearch.performanceanalyzer.metrics;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java b/src/test/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java
similarity index 99%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java
index e593a2ccf..7bf0e8938 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/metricsdb/MetricsDBTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb;
+package org.opensearch.performanceanalyzer.metricsdb;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/ModelTests.java b/src/test/java/org/opensearch/performanceanalyzer/model/ModelTests.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/ModelTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/model/ModelTests.java
index fed1e2e90..92c026c08 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/model/ModelTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/model/ModelTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.model;
+package org.opensearch.performanceanalyzer.model;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCTest.java b/src/test/java/org/opensearch/performanceanalyzer/net/GRPCTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/net/GRPCTest.java
index 480cc7103..5f202823e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/GRPCTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/net/GRPCTest.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
+package org.opensearch.performanceanalyzer.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
 import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;
 import java.util.Objects;
@@ -46,6 +39,13 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 /**
  * GRPCTest tests that our gRPC servers and clients perform mutual authentication when TLS is
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestMultipleNetServers.java b/src/test/java/org/opensearch/performanceanalyzer/net/TestMultipleNetServers.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestMultipleNetServers.java
rename to src/test/java/org/opensearch/performanceanalyzer/net/TestMultipleNetServers.java
index b54ae930f..054921814 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestMultipleNetServers.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/net/TestMultipleNetServers.java
@@ -24,25 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
+package org.opensearch.performanceanalyzer.net;
+
+
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.HashMap;
@@ -56,6 +40,22 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
+import org.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 public class TestMultipleNetServers {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestNetServer.java b/src/test/java/org/opensearch/performanceanalyzer/net/TestNetServer.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestNetServer.java
rename to src/test/java/org/opensearch/performanceanalyzer/net/TestNetServer.java
index 98272d62a..02ebec467 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/net/TestNetServer.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/net/TestNetServer.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.net;
+package org.opensearch.performanceanalyzer.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsRequest;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
 import io.grpc.stub.StreamObserver;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.grpc.MetricsRequest;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
 
 // TestNetServer is a NetServer that clients can check is running or not
 public class TestNetServer extends NetServer implements Runnable {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPUTests.java b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadCPUTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPUTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/os/ThreadCPUTests.java
index 431c039e3..87125556a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadCPUTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadCPUTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
 import org.junit.Test;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java
index 4a62daa44..c54b4983e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadDiskIOTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
 import org.junit.Test;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSchedTests.java b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadSchedTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSchedTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/os/ThreadSchedTests.java
index 5b08ad3b3..0ab59a537 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/os/ThreadSchedTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/os/ThreadSchedTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.os;
+package org.opensearch.performanceanalyzer.os;
 
 
 import org.junit.Test;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerTest.java b/src/test/java/org/opensearch/performanceanalyzer/plugins/PluginControllerTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/plugins/PluginControllerTest.java
index 6b5113f49..d9a0b254c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/plugins/PluginControllerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/plugins/PluginControllerTest.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.plugins;
+package org.opensearch.performanceanalyzer.plugins;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.times;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ActionListener;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.Publisher;
 
 public class PluginControllerTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/GradleTaskForRca.java b/src/test/java/org/opensearch/performanceanalyzer/rca/GradleTaskForRca.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/GradleTaskForRca.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/GradleTaskForRca.java
index 17140610d..5aff16de4 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/GradleTaskForRca.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/GradleTaskForRca.java
@@ -24,6 +24,6 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
+package org.opensearch.performanceanalyzer.rca;
 
 public interface GradleTaskForRca {}
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/RcaControllerTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/RcaControllerTest.java
index b1c893570..6a059787a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaControllerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/RcaControllerTest.java
@@ -24,27 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.ClientServers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
+package org.opensearch.performanceanalyzer.rca;
+
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.sun.net.httpserver.HttpServer;
 import java.io.IOException;
@@ -71,6 +53,24 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.ClientServers;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
+import org.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 @Category(GradleTaskForRca.class)
 public class RcaControllerTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/RcaTestHelper.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/RcaTestHelper.java
index 64717bf15..7816fd8a7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/RcaTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/RcaTestHelper.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca;
+package org.opensearch.performanceanalyzer.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -55,6 +49,12 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.FileAppender;
 import org.jooq.tools.json.JSONObject;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class RcaTestHelper {
     public static List<String> getAllLinesFromStatsLog() {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java
index f65cae14a..87c874542 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/configs/QueueRejectionRcaConfigTest.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs;
+package org.opensearch.performanceanalyzer.rca.configs;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import java.nio.file.Paths;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class QueueRejectionRcaConfigTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java
index 749aa1ff9..200ad68ee 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/exceptions/MalformedAnalysisGraphTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions;
+package org.opensearch.performanceanalyzer.rca.exceptions;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java
index ab058eb9d..6018d647b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/HighCpuSymptomTest.java
@@ -24,23 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators.MovingAverage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.SymptomContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -51,6 +38,19 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.aggregators.MovingAverage;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.SymptomContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
 
 @Category(GradleTaskForRca.class)
 public class HighCpuSymptomTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java
similarity index 81%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java
index aa2d07986..8a509db87 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/OperateGatherThrowingExceptionTest.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
+package org.opensearch.performanceanalyzer.rca.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.HTTP_RequestDocs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
 import java.util.List;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.HTTP_RequestDocs;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
 
 public class OperateGatherThrowingExceptionTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java
index d2defb623..7f22916d7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/RcaTestHelper.java
@@ -24,24 +24,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+package org.opensearch.performanceanalyzer.rca.framework.api;
+
+
 import java.time.Clock;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class RcaTestHelper<T extends GenericSummary> extends Rca<ResourceFlowUnit<T>> {
     private Clock clock;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java
similarity index 99%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java
index 0a88f6ea7..2bdbc2845 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/BucketizedSlidingWindowTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java
index 2ac5ba447..7d1b7a6ee 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/MovingAverageTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 
 @Category(GradleTaskForRca.class)
 public class MovingAverageTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java
index a27464131..2779f1380 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/PersistableSlidingWindowTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
 import java.io.IOException;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java
index fe30e1f77..a8cddfa12 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTest.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 
 @Category(GradleTaskForRca.class)
 public class SlidingWindowTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java
index 8e41425b7..25a38580f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/aggregators/SlidingWindowTestUtil.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.aggregators;
+package org.opensearch.performanceanalyzer.rca.framework.api.aggregators;
 
 
 import java.util.Iterator;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java
index e550a193f..efb86fc8e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/GenericContextTest.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts;
+package org.opensearch.performanceanalyzer.rca.framework.api.contexts;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericContext;
 
 public class GenericContextTest {
     private static class ConcreteGenericContext extends GenericContext {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java
index 51f2810f6..104932641 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/ResourceContextTest.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts;
+package org.opensearch.performanceanalyzer.rca.framework.api.contexts;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceContextMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
 import java.util.List;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.ResourceContextMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
 
 public class ResourceContextTest {
     private ResourceContext uut;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java
index 5e9d6bbdd..b1d37357c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/contexts/SymptomContextTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts;
+package org.opensearch.performanceanalyzer.rca.framework.api.contexts;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
 
 public class SymptomContextTest {
     private SymptomContext uut;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java
index 89e535fee..a9bc21d5a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/flow_units/NodeConfigFlowUnitTest.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units;
+package org.opensearch.performanceanalyzer.rca.framework.api.flow_units;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
+import org.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 public class NodeConfigFlowUnitTest {
     private long ts = 1234;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java
index fe9e87695..ce5a39f21 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/metrics/MetricTestHelper.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics;
+package org.opensearch.performanceanalyzer.rca.framework.api.metrics;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -38,6 +36,8 @@
 import org.jooq.impl.DSL;
 import org.jooq.tools.jdbc.Mock;
 import org.jooq.tools.jdbc.MockConnection;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
 
 public class MetricTestHelper extends Metric {
     private static final String METRIC_TEST_HELPER_NAME = "Metric_test_Helper";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java
index ea0ec7c70..5c105430d 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/persist/SQLParsingUtilTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.persist;
+package org.opensearch.performanceanalyzer.rca.framework.api.persist;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java
index e502fc55a..a7d205cf9 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotClusterSummaryTest.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.protobuf.GeneratedMessageV3;
@@ -42,6 +39,9 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class HotClusterSummaryTest {
     private static final int NUM_OF_NODES = 9;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java
index df51829bd..7ff7f48be 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotNodeSummaryTest.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.List;
@@ -39,6 +36,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotNodeSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class HotNodeSummaryTest {
     private static final String NODE_ID = "ABC123";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java
index c3c83a3db..31976eab7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotResourceSummaryTest.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.List;
@@ -40,6 +36,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotResourceSummaryMessage;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 public class HotResourceSummaryTest {
     private final Resource RESOURCE_TYPE = ResourceUtil.YOUNG_GEN_PROMOTION_RATE;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java
index 6b75a105c..913feb6e2 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/HotShardSummaryTest.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.HotShardSummaryMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.List;
@@ -39,6 +36,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.HotShardSummaryMessage;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
 
 public class HotShardSummaryTest {
     private final String INDEX_NAME = "index_1";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java
index 1226a407c..f881bbf4a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/ResourceUtilTest.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.Resource;
 
 public class ResourceUtilTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java
index a564cfcc8..d876a5ef6 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/TopConsumerSummaryTest.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.TopConsumerSummaryMessage;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.List;
@@ -36,6 +34,8 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.grpc.TopConsumerSummaryMessage;
 
 public class TopConsumerSummaryTest {
     private static final String NAME = "TOP_CONSUMER";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java
index 6047ab425..44c2c602b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/BasicBucketCalculatorTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 public class BasicBucketCalculatorTest {
     BasicBucketCalculator uut;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java
index fe3a1419f..b888fa84f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/bucket/neo/BucketAssignerTest.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.neo;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.neo;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.nio.file.Paths;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.BucketCalculator;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.bucket.UsageBucket;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class BucketAssignerTest {
     private static final String configStr =
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java
index 6fbfcba29..7dcc1d008 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/api/summaries/temperature/NodeLevelDimensionalSummaryTest.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
+package org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureVector;
 
 public class NodeLevelDimensionalSummaryTest {
     @Test
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java
index b28c2bcd4..d9f51679e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/ConfigTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java
index 81160eb12..4a1fd3b91 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/NestedConfigTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
+package org.opensearch.performanceanalyzer.rca.framework.core;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java
index 59a1d2dad..4ce717bfa 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/core/RcaConfTest.java
@@ -24,23 +24,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.CachePriorityOrderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.deciders.configs.WorkLoadTypeConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+package org.opensearch.performanceanalyzer.rca.framework.core;
+
+
 import java.nio.file.Paths;
 import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.CachePriorityOrderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.DeciderConfig;
+import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.WorkLoadTypeConfig;
+import org.opensearch.performanceanalyzer.rca.configs.FieldDataCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageOldGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HighHeapUsageYoungGenRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.HotNodeClusterRcaConfig;
+import org.opensearch.performanceanalyzer.rca.configs.ShardRequestCacheRcaConfig;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class RcaConfTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java
index bc8e51751..269627567 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/flow_units/MetricFlowUnitTestHelper.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.flow_units;
+package org.opensearch.performanceanalyzer.rca.framework.flow_units;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
 import java.util.ArrayList;
 import java.util.List;
 import org.jooq.DSLContext;
@@ -36,6 +35,7 @@
 import org.jooq.impl.DSL;
 import org.jooq.tools.jdbc.Mock;
 import org.jooq.tools.jdbc.MockConnection;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
 
 public class MetricFlowUnitTestHelper {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java
index bba402c68..00fe83f38 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/InstanceDetailsTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
+package org.opensearch.performanceanalyzer.rca.framework.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 public class InstanceDetailsTest {
     @Test
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java
similarity index 81%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java
index 602bcacf7..6f1862166 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/framework/util/RcaUtilTest.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util;
+package org.opensearch.performanceanalyzer.rca.framework.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 import java.nio.file.Paths;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
 
 @Category(GradleTaskForRca.class)
 public class RcaUtilTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java
index 4829d1414..3a174fba1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Cluster.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
+package org.opensearch.performanceanalyzer.rca.integTests.framework;
+
+
 import com.google.gson.JsonElement;
 import java.io.File;
 import java.io.IOException;
@@ -49,6 +40,15 @@
 import org.apache.commons.io.FileUtils;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
+import org.opensearch.performanceanalyzer.threads.exceptions.PAThreadException;
 
 public class Cluster {
     // A cluster can have 0 (single node) to 5 (multi node with dedicated masters) hosts. The
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Host.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Host.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Host.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Host.java
index ce7ac54bf..3038e7989 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/Host.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/Host.java
@@ -24,26 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.ClientServers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.overrides.RcaControllerIt;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.overrides.RcaItMetricsDBProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
+package org.opensearch.performanceanalyzer.rca.integTests.framework;
+
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -74,6 +57,23 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.ClientServers;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.RcaController;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.overrides.RcaControllerIt;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.overrides.RcaItMetricsDBProvider;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
+import org.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
 
 /**
  * This class simulates a cluster node that executes an RCA graph. Each node has its own - GRPC
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java
index 025faa431..afd71356c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/RcaItMarker.java
@@ -24,6 +24,6 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework;
+package org.opensearch.performanceanalyzer.rca.integTests.framework;
 
 public interface RcaItMarker {}
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java
index ccfc8ee07..0506140df 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/TestEnvironment.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework;
+package org.opensearch.performanceanalyzer.rca.integTests.framework;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaControllerHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.RcaControllerHelper;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
 
 public class TestEnvironment {
     private final Cluster cluster;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java
index a977fdf95..e2b55b5de 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AClusterType.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
 
 /**
  * This is a class level annotation that must be present for each of the RCAIt test classes. This
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java
index 80bfdd9f5..6c40c5e2a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AErrorPatternIgnored.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
 import java.lang.annotation.ElementType;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java
index d717e8bd1..f65ccd6c8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AExpect.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 
 /**
  * This annotation is used for validating the result. After invoking the test, the RcaItRunner
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java
index 141b9803b..aea3d12ea 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
 import java.lang.annotation.ElementType;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java
index b5a12b1c1..4fc4f7f19 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaConf.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 /**
  * This annotation can be used to specify an rca.conf file. Usually tests don't need to provide the
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java
index 73b648a85..b21a68b46 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ARcaGraph.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
 import java.lang.annotation.ElementType;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java
index da6023bee..1142e72cc 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATable.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 
 /**
  * This specifies a table for a given metric. This annotation is a sub-field of the AMetric
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java
index 173b033fb..dbb563f44 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/ATuple.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.annotations;
 
 
 import java.lang.annotation.Retention;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java
index a47ce548e..bebed86d9 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/IValidator.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.api;
 
 
 import com.google.gson.JsonElement;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java
index bcd4df4ca..cd8a7f5ac 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/api/TestApi.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.api;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import java.util.Map;
@@ -39,6 +36,9 @@
 import org.apache.logging.log4j.Logger;
 import org.jooq.Record;
 import org.jooq.Result;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
 
 /**
  * This is API class whose object is injected into each of the test methods in case test class
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java
index 758e740a3..718b9b472 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/ClusterType.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.configs;
 
 /** Types of clusters supported by the integration test framework. */
 public enum ClusterType {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java
index ce5755494..174000ee1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/Consts.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.configs;
 
 public class Consts {
     public static final String RCA_IT_BASE_DIR = "/tmp/rcaIt";
@@ -40,7 +40,7 @@ public class Consts {
     public static final String RCAIT_DEFAULT_RCA_CONF_DATA_NODE = TEST_RESOURCES_DIR + "rca.conf";
 
     public static final String INTEG_TESTS_SRC_DIR =
-            "./src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/";
+            "./src/test/java/org/opensearch/performanceanalyzer/rca/integTests/";
 
     public static final String HOST_ID_KEY = "hostId";
     public static final String HOST_ROLE_KEY = "hostRole";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java
index e75c9a54e..72d738766 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/configs/HostTag.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.configs;
 
 public enum HostTag {
     ELECTED_MASTER,
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java
index 1bfb92c89..ef07c7e3c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/AppenderHelper.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.log;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.log;
 
 
 import java.util.Collection;
@@ -48,8 +48,7 @@ public static Configuration addMemoryAppenderToRootLogger() {
                 ConfigurationBuilderFactory.newConfigurationBuilder();
         builder.setStatusLevel(Level.INFO);
         builder.setConfigurationName("RcaItLogger");
-        builder.setPackages(
-                "com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.log");
+        builder.setPackages("org.opensearch.performanceanalyzer.rca.integTests.framework.log");
         RootLoggerComponentBuilder rootLogger = builder.newRootLogger(Level.INFO);
 
         addRcaItInMemoryAppender(builder, rootLogger);
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java
index 4a0e88a0b..34aa443c0 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/log/RcaItInMemoryAppender.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.log;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.log;
 
 
 import java.nio.charset.StandardCharsets;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java
index fe867e6ba..64b96d52e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaConfIt.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import java.util.HashMap;
 import java.util.Map;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 public class RcaConfIt extends RcaConf {
     private String rcaDataStorePath;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java
similarity index 76%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java
index e955310ef..dbf2ee10a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaControllerIt.java
@@ -24,27 +24,27 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.ClientServers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.ClientServers;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.RcaController;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
+import org.opensearch.performanceanalyzer.rca.scheduler.RcaSchedulerState;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 public class RcaControllerIt extends RcaController {
     private final String rcaPath;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java
index 54d2852dc..0c56d9ec3 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/overrides/RcaItMetricsDBProvider.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.overrides;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Dimensions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import org.opensearch.performanceanalyzer.metricsdb.Dimensions;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
 
 public class RcaItMetricsDBProvider extends MetricsDBProvider {
     private final String DB_FILE_PATH;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java
index 14050cd0a..7863a4b8c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/IRcaItRunner.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.runners;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -37,6 +34,9 @@
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import org.apache.commons.io.FileUtils;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public interface IRcaItRunner {
     String SET_CLUSTER_METHOD = "setTestApi";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java
index ddba410ea..f22978114 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItNotEncryptedRunner.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.runners;
 
 public class RcaItNotEncryptedRunner extends RcaItRunnerBase {
     private static final boolean USE_HTTPS = false;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java
index 15435d604..7e64d3284 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/runners/RcaItRunnerBase.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.TestEnvironment;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.log.AppenderHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+package org.opensearch.performanceanalyzer.rca.integTests.framework.runners;
+
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -64,6 +52,18 @@
 import org.junit.runner.manipulation.Filterable;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.Cluster;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.TestEnvironment;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.log.AppenderHelper;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 /** This is the main runner class that is used by the RCA-IT. */
 public abstract class RcaItRunnerBase extends Runner implements IRcaItRunner, Filterable {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java
index 98ef739a4..81ca9f210 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/Constants.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public class Constants {
     public static final String CACHE_TUNING_RESOURCES_DIR =
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java
similarity index 75%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java
index 774632a82..5318c5a28 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/CacheRcaDedicatedMasterITest.java
@@ -24,39 +24,39 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheValidator;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java
index 7e9edb961..384c76e19 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/FieldDataCacheDeciderDedicatedMasterITest.java
@@ -24,35 +24,35 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java
similarity index 74%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java
index 74ea2218f..d62163c3f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/dedicated_master/ShardRequestCacheDeciderDedicatedMasterITest.java
@@ -24,36 +24,36 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java
similarity index 75%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java
index 272a88e38..7e3ed6f65 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/CacheRcaMultiNodeITest.java
@@ -24,39 +24,39 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheValidator;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java
index 2da7bf61a..6390430cf 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/FieldDataCacheDeciderMultiNodeITest.java
@@ -24,35 +24,35 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_FieldData_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.FieldDataCacheDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java
similarity index 74%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java
index fcd9a2004..e6e2a8ab6 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/multi_node/ShardRequestCacheDeciderMultiNodeITest.java
@@ -24,36 +24,36 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.CACHE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.INDEX_NAME;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.Constants.SHARD_ID;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Eviction;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Hit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Request_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator.ShardRequestCacheDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/resource/rca.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/resource/rca.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/resource/rca.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/resource/rca.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java
index 015154e34..e6effba40 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheDeciderValidator.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class FieldDataCacheDeciderValidator implements IValidator {
     AppContext appContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java
index 9bd54ed19..8eaa83cec 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/FieldDataCacheValidator.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.FieldDataCacheClusterRca;
 
 public class FieldDataCacheValidator implements IValidator {
     long startTime;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java
index b8165b0c0..98440048b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheDeciderValidator.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class ShardRequestCacheDeciderValidator implements IValidator {
     AppContext appContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java
index 93bbb561d..0f026f6ab 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/cache_tuning/validator/ShardRequestCacheValidator.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.cache_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.ShardRequestCacheClusterRca;
 
 public class ShardRequestCacheValidator implements IValidator {
     long startTime;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java
similarity index 76%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java
index 7f434cd95..2f8cdb009 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorIT.java
@@ -24,34 +24,34 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.collator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.collator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.collator.validator.CollatorValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.collator.validator.CollatorValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java
index d9f739d8b..99e4cdd9b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/CollatorITConstants.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.collator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.collator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public class CollatorITConstants {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca_master.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca_master.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca_master.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/resources/rca_master.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java
index ec9b85f6a..fe3ad7628 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/collator/validator/CollatorValidator.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.collator.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.collator.validator;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 
 public class CollatorValidator implements IValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java
index f5884ef76..64e57cf61 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/consolidate_tuning/JvmFlipFlopITest.java
@@ -24,40 +24,40 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java
index 57ecb0e60..81b78a6d3 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelOneDedicatedMasterITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelOneDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java
index 772465a37..99971947f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelThreeDedicatedMasterITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelThreeDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelThreeValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelThreeValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java
index 3c77af098..32b1a058f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/dedicated_master/LevelTwoDedicatedMasterITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.dedicated_master.LevelTwoDedicatedMasterITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelTwoValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelTwoValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java
index edde08fcd..3f605fbea 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelOneMultiNodeITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelOneMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelOneValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java
index 9da899c98..90367b844 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelThreeMultiNodeITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelThreeMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelThreeValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelThreeValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java
similarity index 73%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java
index 7dbe4af0c..815447f36 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/multi_node/LevelTwoMultiNodeITest.java
@@ -24,37 +24,37 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.FIELDDATA_CACHE_SIZE_IN_PERCENT;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.HEAP_MAX_SIZE_IN_BYTE;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.multi_node.LevelTwoMultiNodeITest.SHARD_REQUEST_CACHE_SIZE_IN_PERCENT;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelTwoValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.configs.QueueActionConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator.LevelTwoValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.CacheUtil;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java
index c717658f6..47f5e9f0e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelOneValidator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import com.google.gson.JsonArray;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 public class LevelOneValidator extends OldGenPolicyBaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java
index a5de73e88..376fac8dd 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelThreeValidator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import com.google.gson.JsonArray;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 public class LevelThreeValidator extends OldGenPolicyBaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java
index 49d904be8..40ecf6631 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/LevelTwoValidator.java
@@ -24,11 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
 import com.google.gson.JsonArray;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
 
 public class LevelTwoValidator extends OldGenPolicyBaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java
index 251b913a9..2cd5e750f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/old_gen_policy/validator/OldGenPolicyBaseValidator.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.old_gen_policy.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.CacheClearAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyCacheMaxSizeAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 
 public abstract class OldGenPolicyBaseValidator implements IValidator {
     private static final Logger LOG = LogManager.getLogger(OldGenPolicyBaseValidator.class);
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java
index 53d4b62d2..296c8181f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenDeciderFullGCPauseIT.java
@@ -24,30 +24,30 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.JvmGenActionValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.JvmGenActionValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 /**
  * Verifies that we will emit an action to scale up the young generation size if full GC pause time
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java
index 2568b1779..81238d849 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenHighThresholdTest.java
@@ -24,34 +24,34 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.YoungGenNonBreachingValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.YoungGenNonBreachingValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 /**
  * Negative test: Tests that the action is NOT emitted if the threshold is not breached. The
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java
index 79191d4e3..1ac0a2da8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenITConstants.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public final class YoungGenITConstants {
     public static final String RCA_CONF_PATH = Consts.TEST_RESOURCES_DIR + "young_gen/rca.conf";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java
index 491cd3560..e557ca8d5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/YoungGenMissingMetricsTest.java
@@ -24,35 +24,35 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.YoungGenNonBreachingValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Time;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator.YoungGenNonBreachingValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.JvmSizingITConstants;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 /** Negative test: Tests that the action is NOT emitted if the required metrics are missing. */
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java
similarity index 78%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java
index f37a26944..ddb84e98d 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/JvmGenActionValidator.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
 
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class JvmGenActionValidator implements IValidator {
     AppContext appContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java
index 9c6e00f11..aee62b778 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenNonBreachingValidator.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.JvmGenAction;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rest.QueryActionRequestHandler;
 
 public class YoungGenNonBreachingValidator implements IValidator {
     @Override
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java
index 11fabb551..6cea65f93 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvm/young_gen/validator/YoungGenRcaValidator.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvm.young_gen.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.grpc.MetricEnum;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
 
 public class YoungGenRcaValidator implements IValidator {
     long startTime;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java
similarity index 77%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java
index e6d7a344f..5581157b5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseDedicatedMasterIT.java
@@ -24,31 +24,31 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseValidatorDedicatedMaster;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseValidatorDedicatedMaster;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java
index 14b82be60..6a430c627 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseHighThresholdTest.java
@@ -24,33 +24,33 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseNonBreachingValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseNonBreachingValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 /**
  * Negative test: Tests that the action is NOT emitted if the threshold is not breached. The
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java
index 576f47a3e..29abf47a1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseIT.java
@@ -24,32 +24,32 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseValidatorCollocatedMaster;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseValidatorCollocatedMaster;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @Category(RcaItMarker.class)
 @RunWith(RcaItNotEncryptedRunner.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java
index f04f76baf..effc64b95 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/HeapSizeIncreaseMissingMetricsTest.java
@@ -24,34 +24,34 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseNonBreachingValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Type;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator.HeapSizeIncreaseNonBreachingValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 /**
  * Negative test: Tests that the action is NOT emitted if the threshold is not breached. The
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java
index 184102582..c9514116b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/JvmSizingITConstants.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public final class JvmSizingITConstants {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_high_threshold.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_high_threshold.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_high_threshold.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_high_threshold.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master_high_threshold.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master_high_threshold.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master_high_threshold.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/resources/rca_master_high_threshold.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java
index ebd70412c..86c7cd306 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseNonBreachingValidator.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class HeapSizeIncreaseNonBreachingValidator extends HeapSizeIncreaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java
index f4d4d6ca3..f7c094ce9 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidator.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public abstract class HeapSizeIncreaseValidator implements IValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java
index c7a953148..29645e052 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorCollocatedMaster.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class HeapSizeIncreaseValidatorCollocatedMaster extends HeapSizeIncreaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java
index e9132e703..4efcac76d 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/jvmsizing/validator/HeapSizeIncreaseValidatorDedicatedMaster.java
@@ -24,16 +24,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.validator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.HeapSizeIncreaseAction;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class HeapSizeIncreaseValidatorDedicatedMaster extends HeapSizeIncreaseValidator {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java
similarity index 71%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java
index 2770699c8..74feedfc3 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocCoLocatedMaster.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.poc;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java
similarity index 75%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java
index f873fd155..d5cfb21d8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocDedicated.java
@@ -24,29 +24,29 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.poc;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java
similarity index 72%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java
index 2f1c7f6b0..f843a8763 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/RcaItPocSingleNode.java
@@ -24,25 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.poc;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 import java.util.Arrays;
 import java.util.Collections;
 import org.apache.logging.log4j.LogManager;
@@ -50,6 +34,22 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.TestApi;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator.PocValidator;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java
index 0757a7a15..064834682 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/SimpleAnalysisGraph.java
@@ -24,28 +24,28 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.poc;
+
+
 import java.util.ArrayList;
 import java.util.List;
 import org.jooq.Record;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.IndexShardKey;
 
 public class SimpleAnalysisGraph extends OpenSearchAnalysisGraph {
     public static class NodeRca extends Rca<ResourceFlowUnit<HotNodeSummary>> {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java
index b58e660a9..7d0d54693 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/validator/PocValidator.java
@@ -24,14 +24,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.poc.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
 
 // Validators are only initialized once to evaluate a test method.
 public class PocValidator implements IValidator {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java
index 7910f5d58..5b4ca4401 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/Constants.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.Consts;
 
 public class Constants {
     public static final String QUEUE_TUNING_RESOURCES_DIR =
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java
index 87329d061..2a433488b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueDeciderDedicatedMasterITest.java
@@ -24,35 +24,35 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QDeciderNoActionOnUnhealthyValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.GC_Collection_Event;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QDeciderNoActionOnUnhealthyValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java
similarity index 66%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java
index ce572e1bf..965e79224 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/dedicated_master/QueueRcaDedicatedMasterITest.java
@@ -24,31 +24,31 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.dedicated_master;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.dedicated_master;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueRejectionValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueRejectionValidator;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java
similarity index 66%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java
index e52fc4017..336347d24 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueDeciderMultiNodeITest.java
@@ -24,31 +24,31 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueDeciderValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueDeciderValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java
similarity index 66%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java
index abc9f8c37..0d51d1338 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/multi_node/QueueRcaMultiNodeITest.java
@@ -24,31 +24,31 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.multi_node;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.multi_node;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
+import static org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.Constants.QUEUE_TUNING_RESOURCES_DIR;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueRejectionValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_RejectedReqs;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AErrorPatternIgnored;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AExpect;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.AMetric;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ARcaGraph;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATable;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.annotations.ATuple;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.ClusterType;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.configs.HostTag;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.runners.RcaItNotEncryptedRunner;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator.QueueRejectionValidator;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 
 @RunWith(RcaItNotEncryptedRunner.class)
 @Category(RcaItMarker.class)
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/resource/rca.conf b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/resource/rca.conf
similarity index 100%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/resource/rca.conf
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/resource/rca.conf
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java
similarity index 81%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java
index 24e7fe59b..deb5f0fdc 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QDeciderNoActionOnUnhealthyValidator.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaControllerHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.RcaControllerHelper;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class QDeciderNoActionOnUnhealthyValidator implements IValidator {
     AppContext appContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java
similarity index 81%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java
index 96321e762..dd6c4cb1c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueDeciderValidator.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.ResourceEnum;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaControllerHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ModifyQueueCapacityAction;
+import org.opensearch.performanceanalyzer.grpc.ResourceEnum;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.RcaControllerHelper;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
 
 public class QueueDeciderValidator implements IValidator {
     AppContext appContext;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java
index d2681e4a5..8a6bc1317 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/queue_tuning/validator/QueueRejectionValidator.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.queue_tuning.validator;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Assert;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.integTests.framework.api.IValidator;
+import org.opensearch.performanceanalyzer.rca.integTests.tests.util.JsonParserUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.QueueRejectionClusterRca;
 
 public class QueueRejectionValidator implements IValidator {
     long startTime;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java
index 3b8f4dac0..6155bc8a7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/util/JsonParserUtil.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.util;
+package org.opensearch.performanceanalyzer.rca.integTests.tests.util;
 
 
 import com.google.gson.JsonArray;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java
similarity index 68%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java
index 23bd58d34..cff0c5a83 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/listener/MisbehavingGraphOperateMethodListenerTest.java
@@ -24,30 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.listener;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Symptom;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+package org.opensearch.performanceanalyzer.rca.listener;
+
+
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -56,6 +35,27 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Symptom;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_AllocRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
 
 public class MisbehavingGraphOperateMethodListenerTest {
     class FaultyAnalysisGraph extends AnalysisGraph {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java
index 6376f5e87..09a4fbd59 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/NodeStateManagerTest.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -40,6 +35,11 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 
 public class NodeStateManagerTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java
index 08b2800ee..bf0c77469 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/ReceivedFlowUnitStoreTest.java
@@ -24,11 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -39,6 +37,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
 
 @Category(GradleTaskForRca.class)
 public class ReceivedFlowUnitStoreTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java
index 805edb947..afab59085 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/RejectingExecutor.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
 import java.util.Collection;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java
index ad2de754e..19f58c466 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscribeResponseHandlerTest.java
@@ -24,21 +24,21 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.common.collect.Sets;
 import java.util.Objects;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class SubscribeResponseHandlerTest {
     private static final InstanceDetails.Ip HOST = new InstanceDetails.Ip("127.0.0.1");
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java
index b6f2bf3c1..88ba6f8f1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/SubscriptionManagerTest.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.CertificateUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.Objects;
@@ -39,6 +34,11 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.CertificateUtils;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class SubscriptionManagerTest {
     private GRPCConnectionManager grpcConnectionManager;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopperTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/WireHopperTest.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopperTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/WireHopperTest.java
index d9af77d0f..a2303d25a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/WireHopperTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/WireHopperTest.java
@@ -24,29 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net;
+package org.opensearch.performanceanalyzer.rca.net;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.TestNetServer;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -64,6 +44,26 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.net.NetClient;
+import org.opensearch.performanceanalyzer.net.TestNetServer;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.handler.PublishRequestHandler;
+import org.opensearch.performanceanalyzer.rca.net.handler.SubscribeServerHandler;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 @Category(GradleTaskForRca.class)
 public class WireHopperTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java
index a76be988b..e03256744 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/FlowUnitRxTaskTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
@@ -32,15 +32,15 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
 
 @Category(GradleTaskForRca.class)
 public class FlowUnitRxTaskTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java
index 1e4919c6f..a62d38950 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/net/tasks/SubscriptionRxTaskTest.java
@@ -24,19 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.tasks;
+package org.opensearch.performanceanalyzer.rca.net.tasks;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.SubscribeResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
 import io.grpc.stub.StreamObserver;
 import org.junit.Assert;
 import org.junit.Before;
@@ -45,6 +39,12 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.grpc.SubscribeMessage;
+import org.opensearch.performanceanalyzer.grpc.SubscribeResponse;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.requests.CompositeSubscribeRequest;
 
 @Category(GradleTaskForRca.class)
 public class SubscriptionRxTaskTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java
index 3f640e0ae..a5efe3649 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileGCTest.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -49,6 +48,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
 
 public class FileGCTest {
     private static Path testLocation = null;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java
index 07667f08e..e527a1e86 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/FileRotateTest.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,6 +40,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
 
 public class FileRotateTest {
     private Path fileToRotate = null;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java
similarity index 79%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java
index 343d78f9b..19a78c6e8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PersistFlowUnitAndSummaryTest.java
@@ -24,38 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HotNodeRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.threads.ThreadProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -65,6 +36,35 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerThreads;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCAScheduler;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.HotNodeRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.threads.ThreadProvider;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 @Category(GradleTaskForRca.class)
 @SuppressWarnings("serial")
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java
index 7d0e84b9c..342c42acf 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/PublisherEventsPersistorTest.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.Action;
-import com.amazon.opendistro.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.WaitFor;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -46,6 +40,12 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
+import org.opensearch.performanceanalyzer.decisionmaker.actions.ImpactVector;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.persistence.actions.PersistedAction;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.util.WaitFor;
 
 public class PublisherEventsPersistorTest {
     private Path testLocation = null;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java
index 86c70c407..f5d83ffaa 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SQLitePersistorTest.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+package org.opensearch.performanceanalyzer.rca.persistence;
+
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -52,6 +43,15 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
 
 public class SQLitePersistorTest {
     private Path testLocation = null;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java
index 0972b285a..e3a966968 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/SqliteObjectPersistorTest.java
@@ -24,10 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence;
+package org.opensearch.performanceanalyzer.rca.persistence;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.pck1.TestPersist;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
@@ -44,6 +43,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.opensearch.performanceanalyzer.rca.persistence.pck1.TestPersist;
 
 public class SqliteObjectPersistorTest {
     private Path testLocation = null;
@@ -107,10 +107,8 @@ public void persistTwoClassesWithSameName() throws Exception {
         exceptionRule.expectMessage("There is already a table in the Database with the same name");
 
         TestPersist testPersist1 = new TestPersist();
-        com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.pck2.TestPersist
-                testPersist2 =
-                        new com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence
-                                .pck2.TestPersist();
+        org.opensearch.performanceanalyzer.rca.persistence.pck2.TestPersist testPersist2 =
+                new org.opensearch.performanceanalyzer.rca.persistence.pck2.TestPersist();
 
         SQLitePersistor sqlite =
                 new SQLitePersistor(
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java
index 3823a7541..c393700ef 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck1/TestPersist.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.pck1;
+package org.opensearch.performanceanalyzer.rca.persistence.pck1;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
+import org.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
 
 public class TestPersist {
     @ValueColumn int x;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java
index f3892b6cb..3f6a94cdb 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/persistence/pck2/TestPersist.java
@@ -24,10 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.pck2;
+package org.opensearch.performanceanalyzer.rca.persistence.pck2;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
+import org.opensearch.performanceanalyzer.rca.persistence.ValueColumn;
 
 public class TestPersist {
     @ValueColumn int x;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java
index 346d6987e..c7a0168aa 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/response/RcaResponseTest.java
@@ -24,15 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.response;
+package org.opensearch.performanceanalyzer.rca.response;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.jooq.Field;
@@ -44,6 +40,10 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class RcaResponseTest {
     private static final String RCA_NAME = "NAME";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java
index d5a5a1bcd..3f4b4dfee 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/BatchMetricsEnabledSamplerTest.java
@@ -24,20 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -48,6 +41,13 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 public class BatchMetricsEnabledSamplerTest {
     private static Path batchMetricsEnabledConfFile;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java
index 06f89108a..9222a168c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/MetricsDBFileSamplerTest.java
@@ -24,17 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.spy;
 import static org.powermock.api.mockito.PowerMockito.when;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -45,6 +41,10 @@
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ReaderMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java
similarity index 80%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java
index 6a13e2d3c..f6b3300da 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaEnabledSamplerTest.java
@@ -24,25 +24,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaController;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.rca.RcaController;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.RcaRuntimeMetrics;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 
 public class RcaEnabledSamplerTest {
     private RcaEnabledSampler uut;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java
index fb8fd5d47..e8f9b5446 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/samplers/RcaStateSamplersTest.java
@@ -24,13 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers;
+package org.opensearch.performanceanalyzer.rca.samplers;
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
 
 public class RcaStateSamplersTest {
     private RcaStateSamplers uut;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java b/src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java
index 20869660d..44844fe07 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RCASchedulerTaskTests.java
@@ -24,27 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
+package org.opensearch.performanceanalyzer.rca.scheduler;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Symptom;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.DataMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.messages.IntentMsg;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.helpers.AssertHelper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,6 +36,23 @@
 import java.util.concurrent.Executors;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Symptom;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.messages.DataMsg;
+import org.opensearch.performanceanalyzer.rca.messages.IntentMsg;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.spec.helpers.AssertHelper;
 
 @Category(GradleTaskForRca.class)
 public class RCASchedulerTaskTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java
similarity index 81%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java
index 0ab54ad67..a61e5cc71 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/scheduler/RcaSchedulerAsyncTaskTest.java
@@ -24,22 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Symptom;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+package org.opensearch.performanceanalyzer.rca.scheduler;
+
+
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,6 +35,19 @@
 import java.util.concurrent.Executors;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Symptom;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Paging_MajfltRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Sched_Waittime;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
 
 public class RcaSchedulerAsyncTaskTest {
     List<String> completionOrderList = Collections.synchronizedList(new ArrayList<>());
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java
index 021f5a625..b47abf080 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBProviderTestHelper.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec;
+package org.opensearch.performanceanalyzer.rca.spec;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.helpers.OSMetricHelper;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -38,6 +34,10 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.core.MetricsDBProvider;
+import org.opensearch.performanceanalyzer.rca.spec.helpers.OSMetricHelper;
 
 public class MetricsDBProviderTestHelper extends MetricsDBProvider {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java
index 0e6f26232..f5b7f8960 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/MetricsDBRcaIntegration.java
@@ -24,19 +24,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec;
+package org.opensearch.performanceanalyzer.rca.spec;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.helpers.AssertHelper;
 import java.util.ArrayList;
 import java.util.List;
 import org.jooq.Record;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.spec.helpers.AssertHelper;
 
 @Category(GradleTaskForRca.class)
 public class MetricsDBRcaIntegration {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java
index f6d0f2945..c77e7ef06 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaConfTests.java
@@ -24,20 +24,20 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec;
+package org.opensearch.performanceanalyzer.rca.spec;
 
 import static com.google.common.collect.Maps.newHashMap;
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 @Category(GradleTaskForRca.class)
 public class RcaConfTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java
index ff1934413..ff0e12cd2 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/RcaSpecTests.java
@@ -24,27 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec;
+package org.opensearch.performanceanalyzer.rca.spec;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Symptom;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Node;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -53,6 +38,21 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Symptom;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.SymptomFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Used;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Node;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.scheduler.FlowUnitOperationArgWrapper;
+import org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
 
 @Category(GradleTaskForRca.class)
 public class RcaSpecTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java
index a1f0fdb7b..19dc11796 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/ThresholdTests.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec;
+package org.opensearch.performanceanalyzer.rca.spec;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderCountMismatch;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderValueMismatch;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 import java.io.IOException;
 import java.nio.file.Paths;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.exceptions.MalformedThresholdFile;
+import org.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderCountMismatch;
+import org.opensearch.performanceanalyzer.rca.exceptions.OverridesAndPrecedenceOrderValueMismatch;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.ThresholdMain;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
 
 @Category(GradleTaskForRca.class)
 public class ThresholdTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java
index e117cc4f8..7ff598436 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/AssertHelper.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.helpers;
+package org.opensearch.performanceanalyzer.rca.spec.helpers;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java
index 561ed8641..ab699fba7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/spec/helpers/OSMetricHelper.java
@@ -24,15 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.helpers;
+package org.opensearch.performanceanalyzer.rca.spec.helpers;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Dimensions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.util.ArrayList;
 import java.util.List;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.Dimensions;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public class OSMetricHelper {
     static List<String> dims;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java
index b40161840..bd32b86ed 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/collectors/SampleAggregatorTest.java
@@ -24,20 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.RcaStatsReporter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.IStatistic;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.format.DefaultFormatter;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSetTestHelper;
+package org.opensearch.performanceanalyzer.rca.stats.collectors;
+
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -49,6 +38,17 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.stats.RcaStatsReporter;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.ISampler;
+import org.opensearch.performanceanalyzer.rca.stats.emitters.PeriodicSamplers;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.IStatistic;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.AggregateValue;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.Value;
+import org.opensearch.performanceanalyzer.rca.stats.format.DefaultFormatter;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSetTestHelper;
 
 public class SampleAggregatorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java
index 794bca3dd..af7c64abb 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/eval/impl/NamedCounterTest.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl;
+package org.opensearch.performanceanalyzer.rca.stats.eval.impl;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.stats.eval.impl.vals.NamedAggregateValue;
 
 public class NamedCounterTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java
index bb60fcfac..3a54a17ff 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/listeners/IListenerTest.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.listeners;
+package org.opensearch.performanceanalyzer.rca.stats.listeners;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSetTestHelper;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSet;
+import org.opensearch.performanceanalyzer.rca.stats.measurements.MeasurementSetTestHelper;
 
 public class IListenerTest {
     class Listener implements IListener {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java
index e5340e909..fb8730de8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/stats/measurements/MeasurementSetTestHelper.java
@@ -24,12 +24,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.measurements;
+package org.opensearch.performanceanalyzer.rca.stats.measurements;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 import java.util.Arrays;
 import java.util.List;
+import org.opensearch.performanceanalyzer.rca.stats.eval.Statistics;
 
 public enum MeasurementSetTestHelper implements MeasurementSet {
     TEST_MEASUREMENT1(
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java
similarity index 90%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java
index 6eef5a0e7..99a9b92d7 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/ResourceHeatMapGraphTest.java
@@ -24,48 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.ClientServers;
-import com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.net.GRPCConnectionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotThroughput;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotalSyscallRate;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactClusterLevelNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Stats;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.NodeStateManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.net.WireHopper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.Persistable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.PersistenceFactory;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.SQLiteReader;
+package org.opensearch.performanceanalyzer.rca.store;
+
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -90,6 +51,45 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.ClientServers;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.net.GRPCConnectionManager;
+import org.opensearch.performanceanalyzer.rca.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.AnalysisGraph;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotThroughput;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.IO_TotalSyscallRate;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.ClusterTemperatureSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.CompactClusterLevelNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.temperature.NodeLevelDimensionalSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.ConnectedComponent;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.framework.core.RcaConf;
+import org.opensearch.performanceanalyzer.rca.framework.core.Stats;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.HeatZoneAssigner;
+import org.opensearch.performanceanalyzer.rca.framework.core.temperature.TemperatureDimension;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaConsts;
+import org.opensearch.performanceanalyzer.rca.framework.util.RcaUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.SQLiteQueryUtils;
+import org.opensearch.performanceanalyzer.rca.net.NodeStateManager;
+import org.opensearch.performanceanalyzer.rca.net.ReceivedFlowUnitStore;
+import org.opensearch.performanceanalyzer.rca.net.SubscriptionManager;
+import org.opensearch.performanceanalyzer.rca.net.WireHopper;
+import org.opensearch.performanceanalyzer.rca.persistence.Persistable;
+import org.opensearch.performanceanalyzer.rca.persistence.PersistenceFactory;
+import org.opensearch.performanceanalyzer.rca.scheduler.RCASchedulerTask;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.temperature.ClusterTemperatureRca;
+import org.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler;
+import org.opensearch.performanceanalyzer.util.SQLiteReader;
 
 public class ResourceHeatMapGraphTest {
     private final int THREADS = 3;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java
index ece13eb45..e4d3e8d2c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/metric/temperature/byShard/SumOverOperationsForIndexShardProfileSummaryGroupTest.java
@@ -24,15 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
+package org.opensearch.performanceanalyzer.rca.store.metric.temperature.byShard;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.SQLiteReader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.SQLException;
@@ -43,6 +37,12 @@
 import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.TemperatureMetricsBase;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.capacity.TotalCpuUtilForTotalNodeMetric;
+import org.opensearch.performanceanalyzer.rca.store.metric.temperature.shardIndependent.ShardIndependentTemperatureCalculatorCpuUtilMetric;
+import org.opensearch.performanceanalyzer.util.SQLiteReader;
 
 public class SumOverOperationsForIndexShardProfileSummaryGroupTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java
index fa385edae..e0baf1889 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/HighOldGenOccupancyRcaTest.java
@@ -24,27 +24,27 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
 
 public class HighOldGenOccupancyRcaTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java
index 6e3394b3f..065b35e84 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/LargeHeapClusterRcaTest.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
 
 public class LargeHeapClusterRcaTest {
     @Mock private OldGenContendedRca mockOldGenContendedRca;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java
index b8c13af8f..c05d1cd47 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenContendedRcaTest.java
@@ -24,28 +24,28 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.util.MemInfoParser;
 import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.util.MemInfoParser;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java
index 3589032a4..c1e090508 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/store/rca/jvmsizing/OldGenReclamationRcaTest.java
@@ -24,26 +24,26 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
+package org.opensearch.performanceanalyzer.rca.store.rca.jvmsizing;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
 
 public class OldGenReclamationRcaTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java b/src/test/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java
index d6e51a6d0..832133847 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rca/util/ClusterUtilsTest.java
@@ -24,13 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rca.util;
+package org.opensearch.performanceanalyzer.rca.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,6 +34,10 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 
 public class ClusterUtilsTest {
     private static final String HOST1 = "host1";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AbstractReaderTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/AbstractReaderTests.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AbstractReaderTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/AbstractReaderTests.java
index 1fd9ebba0..fc620f6a1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AbstractReaderTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/AbstractReaderTests.java
@@ -24,16 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AbstractTests;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.DiskMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MetricStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -48,21 +41,28 @@
 import org.jooq.Condition;
 import org.jooq.impl.DSL;
 import org.junit.Ignore;
+import org.opensearch.performanceanalyzer.AbstractTests;
+import org.opensearch.performanceanalyzer.collectors.DiskMetrics;
+import org.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
+import org.opensearch.performanceanalyzer.collectors.MetricStatus;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricDimension;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MasterServiceMetrics.MasterPendingStatus;
+// org.opensearch.performanceanalyzer.collectors.MasterServiceMetrics.MasterPendingStatus;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeDetailsCollector.NodeDetailsStatus;
+// org.opensearch.performanceanalyzer.collectors.NodeDetailsCollector.NodeDetailsStatus;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeStatsMetricsCollector;
+// org.opensearch.performanceanalyzer.collectors.NodeStatsMetricsCollector;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.reader.MetricPropertiesTests.FailureCondition;
+// org.opensearch.performanceanalyzer.reader.MetricPropertiesTests.FailureCondition;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MasterServiceMetrics.MasterPendingStatus;
+// org.opensearch.performanceanalyzer.collectors.MasterServiceMetrics.MasterPendingStatus;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeDetailsCollector.NodeDetailsStatus;
+// org.opensearch.performanceanalyzer.collectors.NodeDetailsCollector.NodeDetailsStatus;
 // import
-// com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeStatsMetricsCollector;
+// org.opensearch.performanceanalyzer.collectors.NodeStatsMetricsCollector;
 
 @Ignore
 public class AbstractReaderTests extends AbstractTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java b/src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java
index a638dfe8c..0a7c2fdde 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlProcessorTest.java
@@ -24,15 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MetricStatus;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -43,6 +39,10 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.collectors.MetricStatus;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class AdmissionControlProcessorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java b/src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java
index 2fbd4c06e..dd6d93774 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/AdmissionControlSnapshotTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java b/src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java
index eae2b7200..71de060c6 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTestHelper.java
@@ -24,17 +24,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverrides;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
-import com.amazon.opendistro.opensearch.performanceanalyzer.util.JsonConverter;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import org.opensearch.performanceanalyzer.config.overrides.ConfigOverrides;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
+import org.opensearch.performanceanalyzer.util.JsonConverter;
 
 public class ClusterDetailsEventProcessorTestHelper extends AbstractReaderTests {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java
index 6e2411c39..c1b3d4813 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/ClusterDetailsEventProcessorTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverrides;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Collections;
 import java.util.List;
@@ -44,6 +41,9 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.opensearch.performanceanalyzer.config.overrides.ConfigOverrides;
+import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesApplier;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class ClusterDetailsEventProcessorTests {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java
index dac78f93c..7ea0378ff 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/FaultDetectionMetricsSnapshotTests.java
@@ -24,11 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import org.jooq.BatchBindStep;
@@ -37,6 +36,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class FaultDetectionMetricsSnapshotTests {
     private static final String DB_URL = "jdbc:sqlite:";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java b/src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java
similarity index 91%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java
index d3f651ed9..cfccd45b5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoProcessorTest.java
@@ -24,14 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.GCInfoCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.Event;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.NavigableMap;
@@ -41,6 +38,9 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.collectors.GCInfoCollector;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.reader_writer_shared.Event;
 
 public class GarbageCollectorInfoProcessorTest {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java b/src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java
index b41d915c9..3ee7a95e1 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/GarbageCollectorInfoSnapshotTest.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java
index b8d24a1b5..1fa80604b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/MasterEventMetricsSnapshotTests.java
@@ -24,11 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -37,6 +36,7 @@
 import org.jooq.Result;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class MasterEventMetricsSnapshotTests {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java
index ebe5cf91b..cc743d6ba 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/MasterThrottlingMetricsSnapshotTests.java
@@ -24,11 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import org.jooq.BatchBindStep;
@@ -36,6 +35,7 @@
 import org.jooq.Result;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class MasterThrottlingMetricsSnapshotTests {
     private static final String DB_URL = "jdbc:sqlite:";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java
index 5a55e8e72..05af2fd2f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/MemoryDBSnapshotTests.java
@@ -24,14 +24,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -41,6 +40,7 @@
 import org.jooq.impl.DSL;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class MemoryDBSnapshotTests extends AbstractReaderTests {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java
similarity index 96%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java
index d1cd111e2..aa3aad765 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/MetricPropertiesConfigTests.java
@@ -24,12 +24,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.List;
@@ -38,6 +37,7 @@
 import org.jooq.Condition;
 import org.jooq.Field;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class MetricPropertiesConfigTests extends AbstractReaderTests {
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java
index 378819c5e..00ed42dd5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/MetricsEmitterTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.closeTo;
@@ -32,11 +32,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.TroubleshootingConfig;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Dimensions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -52,6 +47,11 @@
 import org.jooq.impl.DSL;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.config.TroubleshootingConfig;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.Dimensions;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import org.powermock.api.mockito.PowerMockito;
 
 // @PowerMockIgnore({ "org.apache.logging.log4j.*" })
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java
index b267c2a29..37a800704 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/OSMetricsSnapshotTests.java
@@ -24,11 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.HashMap;
@@ -37,6 +36,7 @@
 import org.jooq.Record;
 import org.jooq.Result;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 @SuppressWarnings("serial")
 public class OSMetricsSnapshotTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java
index af4e810e6..e18f18fdb 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/ReaderMetricsProcessorTests.java
@@ -24,24 +24,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
-import static com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor.BATCH_METRICS_ENABLED_CONF_FILE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor.BATCH_METRICS_ENABLED_CONF_FILE;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.MetricName;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Files;
@@ -61,6 +52,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingTaskDimension;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MasterPendingValue;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics.MetricName;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
 
 public class ReaderMetricsProcessorTests extends AbstractReaderTests {
     public String rootLocation;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java b/src/test/java/org/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java
similarity index 99%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java
index bbd19e29b..408043d1e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/ShardProfileSummaryRequestMetricsSnapshotTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java b/src/test/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java
similarity index 94%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java
index 38274c19f..7815cb791 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/reader/ShardStateMetricsSnapshotTest.java
@@ -24,11 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.reader;
+package org.opensearch.performanceanalyzer.reader;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import org.jooq.BatchBindStep;
@@ -36,6 +35,7 @@
 import org.jooq.Result;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
 
 public class ShardStateMetricsSnapshotTest {
     private static final String DB_URL = "jdbc:sqlite:";
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java b/src/test/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java
index a9b799f8d..36acaf9e4 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rest/QueryBatchRequestHandlerTest.java
@@ -24,18 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
-import com.amazon.opendistro.opensearch.performanceanalyzer.core.Util;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Dimensions;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.model.MetricsModel;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
+package org.opensearch.performanceanalyzer.rest;
+
+
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import java.io.File;
@@ -57,6 +48,15 @@
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
+import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.core.Util;
+import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.metricsdb.Dimensions;
+import org.opensearch.performanceanalyzer.metricsdb.Metric;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.model.MetricsModel;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 public class QueryBatchRequestHandlerTest {
     private QueryBatchRequestHandler handler;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java b/src/test/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java
similarity index 93%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java
index c34a33340..1074b6d4b 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/rest/QueryMetricsRequestHandlerTests.java
@@ -24,15 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.rest;
+package org.opensearch.performanceanalyzer.rest;
 
 import static org.junit.Assert.assertEquals;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.MetricsResponse;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 import io.grpc.stub.StreamObserver;
 import java.security.InvalidParameterException;
 import java.util.Arrays;
@@ -41,6 +36,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import org.junit.Before;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.grpc.MetricsResponse;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metrics.MetricsRestUtil;
+import org.opensearch.performanceanalyzer.metrics.handler.MetricsServerHandler;
+import org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor;
 
 @SuppressWarnings("serial")
 public class QueryMetricsRequestHandlerTests {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java b/src/test/java/org/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java
similarity index 98%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java
rename to src/test/java/org/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java
index eb503da4c..07bd81fe4 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/sqlite/PerformanceAnalyzerSqliteTests.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.sqlite;
+package org.opensearch.performanceanalyzer.sqlite;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java
similarity index 82%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java
index 72f7f4f79..e5decd28c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCacheTest.java
@@ -24,18 +24,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.collector;
+package org.opensearch.performanceanalyzer.store.collector;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 @Category(GradleTaskForRca.class)
 public class NodeConfigCacheTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java
index 1bdaa7759..ca9ffcd8c 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigClusterCollectorTest.java
@@ -24,23 +24,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.collector;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigClusterCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+package org.opensearch.performanceanalyzer.store.collector;
+
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigClusterCollector;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
 
 @Category(GradleTaskForRca.class)
 public class NodeConfigClusterCollectorTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java
similarity index 85%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java
index b61ee53c6..8985f5a95 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/collector/NodeConfigCollectorTest.java
@@ -24,29 +24,29 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.collector;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.flow_units.MetricFlowUnitTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+package org.opensearch.performanceanalyzer.store.collector;
+
+
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.NodeConfigFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Cache_Max_Size;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.Heap_Max;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.ThreadPool_QueueCapacity;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.flow_units.MetricFlowUnitTestHelper;
+import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCollector;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class NodeConfigCollectorTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java
index b6871cb17..99958708e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/metric/AggregateMetricTest.java
@@ -24,21 +24,21 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.metric;
+package org.opensearch.performanceanalyzer.store.metric;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
 import java.util.Arrays;
 import org.junit.Test;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.MetricFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.CPU_Utilization;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.rca.spec.MetricsDBProviderTestHelper;
+import org.opensearch.performanceanalyzer.rca.store.metric.AggregateMetric;
 
 public class AggregateMetricTest {
     private static final String TABLE_NAME = CPU_Utilization.NAME;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java
similarity index 87%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java
index 6f7e91927..f67c9720f 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/HighHeapUsageClusterRcaTest.java
@@ -24,22 +24,22 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca;
+package org.opensearch.performanceanalyzer.store.rca;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.HighHeapUsageClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class HighHeapUsageClusterRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java
similarity index 82%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java
index 63dc6a4d1..9804e33bf 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/HotNodeClusterRcaTest.java
@@ -24,26 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca;
+package org.opensearch.performanceanalyzer.store.rca;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Rca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -53,6 +37,22 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Rca;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.contexts.ResourceContext;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.HotNodeClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class HotNodeClusterRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java
similarity index 83%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java
index dbec8e983..f02cf25dd 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/FieldDataCacheRcaTest.java
@@ -24,23 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.cache;
+package org.opensearch.performanceanalyzer.store.rca.cache;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.FieldDataCacheRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -51,6 +38,19 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.FieldDataCacheRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class FieldDataCacheRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java
index 04949f232..851fa1392 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cache/ShardRequestCacheRcaTest.java
@@ -24,23 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.cache;
+package org.opensearch.performanceanalyzer.store.rca.cache;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cache.ShardRequestCacheRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -51,6 +38,19 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.cache.ShardRequestCacheRca;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class ShardRequestCacheRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java
similarity index 92%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java
index 9edccf0d5..038e39715 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/cluster/BaseClusterRcaTest.java
@@ -24,24 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.cluster;
+package org.opensearch.performanceanalyzer.store.rca.cluster;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.grpc.Resource;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 import java.sql.SQLException;
 import java.time.Clock;
 import java.time.Duration;
@@ -53,6 +39,20 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.grpc.Resource;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotClusterSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.cluster.BaseClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessorTestHelper;
 
 @Category(GradleTaskForRca.class)
 public class BaseClusterRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java
index 5e2202333..7d7b754f5 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotcpu/GenericResourceRcaTest.java
@@ -24,17 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotcpu;
+package org.opensearch.performanceanalyzer.store.rca.hotcpu;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hot_node.HighCpuRca;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -43,6 +36,13 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.store.rca.hot_node.HighCpuRca;
 
 @Category(GradleTaskForRca.class)
 public class GenericResourceRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java
index de356ddbc..c01eadfa8 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageOldGenRcaTest.java
@@ -24,19 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotheap;
+package org.opensearch.performanceanalyzer.store.rca.hotheap;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -47,6 +38,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.TopConsumerSummary;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageOldGenRca;
 
 @Category(GradleTaskForRca.class)
 public class HighHeapUsageOldGenRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java
index 314285f9d..331824e83 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/HighHeapUsageYoungGenRcaTest.java
@@ -24,19 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotheap;
+package org.opensearch.performanceanalyzer.store.rca.hotheap;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageYoungGenRca;
 import com.google.common.collect.Lists;
 import java.time.Clock;
 import java.time.Duration;
@@ -47,6 +38,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.HighHeapUsageYoungGenRca;
 
 @Category(GradleTaskForRca.class)
 public class HighHeapUsageYoungGenRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java
similarity index 84%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java
index a24505ba6..8fd50da8e 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotheap/NodeStatAggregatorTest.java
@@ -24,14 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotheap;
+package org.opensearch.performanceanalyzer.store.rca.hotheap;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotheap.NodeStatAggregator;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -39,6 +34,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotheap.NodeStatAggregator;
 
 @Category(GradleTaskForRca.class)
 public class NodeStatAggregatorTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java
similarity index 95%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java
index 0257b71f0..9e9a1ce1a 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardClusterRcaTest.java
@@ -24,21 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotshard;
-
-
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Resources;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
+package org.opensearch.performanceanalyzer.store.rca.hotshard;
+
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -46,6 +34,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.RcaTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.Resources;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardClusterRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class HotShardClusterRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java
similarity index 88%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java
index f505f7337..23095dbec 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/hotshard/HotShardRcaTest.java
@@ -24,22 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.hotshard;
+package org.opensearch.performanceanalyzer.store.rca.hotshard;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.Metric;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -50,6 +38,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.Metric;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotShardSummary;
+import org.opensearch.performanceanalyzer.rca.framework.core.GenericSummary;
+import org.opensearch.performanceanalyzer.rca.store.rca.hotshard.HotShardRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class HotShardRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java b/src/test/java/org/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java
similarity index 86%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java
rename to src/test/java/org/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java
index becba7f7c..08a12bf9d 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/store/rca/threadpool/QueueRejectionRcaTest.java
@@ -24,21 +24,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.store.rca.threadpool;
+package org.opensearch.performanceanalyzer.store.rca.threadpool;
 
 import static java.time.Instant.ofEpochMilli;
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.AppContext;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.rca.threadpool.QueueRejectionRca;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
@@ -49,6 +38,17 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.opensearch.performanceanalyzer.AppContext;
+import org.opensearch.performanceanalyzer.metrics.AllMetrics;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.GradleTaskForRca;
+import org.opensearch.performanceanalyzer.rca.framework.api.flow_units.ResourceFlowUnit;
+import org.opensearch.performanceanalyzer.rca.framework.api.metrics.MetricTestHelper;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotNodeSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.HotResourceSummary;
+import org.opensearch.performanceanalyzer.rca.framework.api.summaries.ResourceUtil;
+import org.opensearch.performanceanalyzer.rca.store.rca.threadpool.QueueRejectionRca;
+import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
 
 @Category(GradleTaskForRca.class)
 public class QueueRejectionRcaTest {
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/CopyTestResource.java b/src/test/java/org/opensearch/performanceanalyzer/util/CopyTestResource.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/CopyTestResource.java
rename to src/test/java/org/opensearch/performanceanalyzer/util/CopyTestResource.java
index f1bbb4533..05375e5f0 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/CopyTestResource.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/util/CopyTestResource.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SQLiteReader.java b/src/test/java/org/opensearch/performanceanalyzer/util/SQLiteReader.java
similarity index 89%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SQLiteReader.java
rename to src/test/java/org/opensearch/performanceanalyzer/util/SQLiteReader.java
index 564c0c0f4..01ae0d109 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/SQLiteReader.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/util/SQLiteReader.java
@@ -24,12 +24,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 
-import com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB;
-import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.core.Queryable;
-import com.amazon.opendistro.opensearch.performanceanalyzer.reader.Removable;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -38,6 +35,9 @@
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
+import org.opensearch.performanceanalyzer.metricsdb.MetricsDB;
+import org.opensearch.performanceanalyzer.rca.framework.core.Queryable;
+import org.opensearch.performanceanalyzer.reader.Removable;
 
 public class SQLiteReader implements Queryable, Removable {
     private final Connection conn;
diff --git a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/WaitFor.java b/src/test/java/org/opensearch/performanceanalyzer/util/WaitFor.java
similarity index 97%
rename from src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/WaitFor.java
rename to src/test/java/org/opensearch/performanceanalyzer/util/WaitFor.java
index ad7972cbe..e0f8db274 100644
--- a/src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/util/WaitFor.java
+++ b/src/test/java/org/opensearch/performanceanalyzer/util/WaitFor.java
@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistro.opensearch.performanceanalyzer.util;
+package org.opensearch.performanceanalyzer.util;
 
 
 import java.time.Duration;
diff --git a/src/test/resources/rca/rca.conf b/src/test/resources/rca/rca.conf
index de65319bb..47ef068a0 100644
--- a/src/test/resources/rca/rca.conf
+++ b/src/test/resources/rca/rca.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/rca_elected_master.conf b/src/test/resources/rca/rca_elected_master.conf
index 9931138e3..9eb8f9d5f 100644
--- a/src/test/resources/rca/rca_elected_master.conf
+++ b/src/test/resources/rca/rca_elected_master.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/rca_master.conf b/src/test/resources/rca/rca_master.conf
index 4a42e566d..c552b6e14 100644
--- a/src/test/resources/rca/rca_master.conf
+++ b/src/test/resources/rca/rca_master.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/rca_muted.conf b/src/test/resources/rca/rca_muted.conf
index 171dcc315..c3b25050f 100644
--- a/src/test/resources/rca/rca_muted.conf
+++ b/src/test/resources/rca/rca_muted.conf
@@ -1,5 +1,5 @@
 {
-  "analysis-graph-implementor" : "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+  "analysis-graph-implementor" : "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   "rca-store-location" : "s3://sifi-store/rcas/",
   "threshold-store-location" : "s3://sifi-store/thresholds/",
   "new-rca-check-minutes" : 60,
diff --git a/src/test/resources/rca/young_gen/rca.conf b/src/test/resources/rca/young_gen/rca.conf
index d1866243a..72e8745d0 100644
--- a/src/test/resources/rca/young_gen/rca.conf
+++ b/src/test/resources/rca/young_gen/rca.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/young_gen/rca_high_threshold.conf b/src/test/resources/rca/young_gen/rca_high_threshold.conf
index 3df75a5a4..b147576b7 100644
--- a/src/test/resources/rca/young_gen/rca_high_threshold.conf
+++ b/src/test/resources/rca/young_gen/rca_high_threshold.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/young_gen/rca_master.conf b/src/test/resources/rca/young_gen/rca_master.conf
index e21448cfa..fb1c806b7 100644
--- a/src/test/resources/rca/young_gen/rca_master.conf
+++ b/src/test/resources/rca/young_gen/rca_master.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/rca/young_gen/rca_master_high_threshold.conf b/src/test/resources/rca/young_gen/rca_master_high_threshold.conf
index 4324e58ff..df21d25f6 100644
--- a/src/test/resources/rca/young_gen/rca_master_high_threshold.conf
+++ b/src/test/resources/rca/young_gen/rca_master_high_threshold.conf
@@ -1,6 +1,6 @@
 {
   "analysis-graph-implementor":
-    "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
+    "org.opensearch.performanceanalyzer.rca.store.AnalysisGraphTest",
   // it can be file:// or s3://
   "rca-store-location": "s3://sifi-store/rcas/",
 
diff --git a/src/test/resources/reader/1566413960000 b/src/test/resources/reader/1566413960000
index df233fee3..0cb1736d7 100644
--- a/src/test/resources/reader/1566413960000
+++ b/src/test/resources/reader/1566413960000
@@ -39,7 +39,7 @@ $
 {"ThreadPoolType":"index","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"listener","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":1,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"management","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":5,"ThreadPool_ActiveThreads":0}
-{"ThreadPoolType":"opendistro_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
+{"ThreadPoolType":"opensearch_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"refresh","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":2,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"search","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":7,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"search_throttled","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
@@ -186,7 +186,7 @@ Sched_Runtime:0.0
 Sched_Waittime:0.0
 Sched_CtxRate:0.0
 Heap_AllocRate:0.0
-threadName:opendistro_job_sweeper[T#1]
+threadName:opensearch_job_sweeper[T#1]
 Thread_Blocked_Time:0.0
 Thread_Blocked_Event:0
 IO_ReadThroughput:0.0
diff --git a/src/test/resources/reader/1566413965000 b/src/test/resources/reader/1566413965000
index ca4b55bb2..13e721e4c 100644
--- a/src/test/resources/reader/1566413965000
+++ b/src/test/resources/reader/1566413965000
@@ -38,7 +38,7 @@ $
 {"ThreadPoolType":"index","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"listener","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":1,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"management","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":5,"ThreadPool_ActiveThreads":0}
-{"ThreadPoolType":"opendistro_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
+{"ThreadPoolType":"opensearch_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"refresh","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":2,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"search","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":7,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"search_throttled","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
@@ -185,7 +185,7 @@ Sched_Runtime:0.0
 Sched_Waittime:0.0
 Sched_CtxRate:0.0
 Heap_AllocRate:0.0
-threadName:opendistro_job_sweeper[T#1]
+threadName:opensearch_job_sweeper[T#1]
 Thread_Blocked_Time:0.0
 Thread_Blocked_Event:0
 IO_ReadThroughput:0.0
diff --git a/src/test/resources/reader/1566413970000 b/src/test/resources/reader/1566413970000
index 2d1ebbfc9..b4fd88b80 100644
--- a/src/test/resources/reader/1566413970000
+++ b/src/test/resources/reader/1566413970000
@@ -39,7 +39,7 @@ $
 {"ThreadPoolType":"index","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"listener","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":1,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"management","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":5,"ThreadPool_ActiveThreads":0}
-{"ThreadPoolType":"opendistro_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
+{"ThreadPoolType":"opensearch_monitor_runner","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"refresh","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":2,"ThreadPool_ActiveThreads":1}
 {"ThreadPoolType":"search","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":7,"ThreadPool_ActiveThreads":0}
 {"ThreadPoolType":"search_throttled","ThreadPool_QueueSize":0,"ThreadPool_RejectedReqs":0,"ThreadPool_TotalThreads":0,"ThreadPool_ActiveThreads":0}
@@ -186,7 +186,7 @@ Sched_Runtime:0.0
 Sched_Waittime:0.0
 Sched_CtxRate:0.0
 Heap_AllocRate:0.0
-threadName:opendistro_job_sweeper[T#1]
+threadName:opensearch_job_sweeper[T#1]
 Thread_Blocked_Time:0.0
 Thread_Blocked_Event:0
 IO_ReadThroughput:0.0