diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/IndexerCorePlusApplication.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/IndexerCorePlusApplication.java
similarity index 87%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/IndexerCorePlusApplication.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/IndexerCorePlusApplication.java
index e3faa0e836c5a103f1621ddb53368ca518fc0d8a..6d87d6c696e2c217256133505394485d7d4de2cc 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/IndexerCorePlusApplication.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/IndexerCorePlusApplication.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp;
+package org.opengroup.osdu.indexer;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.config.CustomContextConfiguration;
-import org.opengroup.osdu.indexer.provider.gcp.web.config.WebAppMainContextConfiguration;
+import org.opengroup.osdu.indexer.indexing.config.CustomContextConfiguration;
+import org.opengroup.osdu.indexer.web.config.WebAppMainContextConfiguration;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/AttributesCache.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/AttributesCache.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/AttributesCache.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/AttributesCache.java
index 9b909930bc2dc49700f69e917e1ef4feaf71a444..f32b5e7054b7d27e8e96ffbd3cc2127532f8f9a4 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/AttributesCache.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/AttributesCache.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.cache;
+package org.opengroup.osdu.indexer.common.cache;
import java.util.Set;
import javax.inject.Inject;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/CacheConfig.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/CacheConfig.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/CacheConfig.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/CacheConfig.java
index de9d0843bcb8d939388bec7db004f28e211239a7..e24b953d705259044717bfdaacd4cfbe13e5a86f 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/CacheConfig.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/CacheConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.cache;
+package org.opengroup.osdu.indexer.common.cache;
import lombok.RequiredArgsConstructor;
import org.opengroup.osdu.core.common.cache.ICache;
@@ -26,7 +26,7 @@ import org.opengroup.osdu.core.common.partition.PartitionInfo;
import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
import org.opengroup.osdu.core.common.provider.interfaces.IIndexCache;
import org.opengroup.osdu.core.cache.RedisCacheBuilder;
-import org.opengroup.osdu.indexer.provider.gcp.common.di.CorePlusConfigurationProperties;
+import org.opengroup.osdu.indexer.common.di.CorePlusConfigurationProperties;
import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/ElasticCredentialsCache.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/ElasticCredentialsCache.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/ElasticCredentialsCache.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/ElasticCredentialsCache.java
index ab5af737b666b656c27b62ac6d3ea836a0e7516b..2c7a3f2cc8540fef90db21a0ca47e4af54489717 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/ElasticCredentialsCache.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/ElasticCredentialsCache.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.cache;
+package org.opengroup.osdu.indexer.common.cache;
import com.lambdaworks.redis.RedisException;
import lombok.RequiredArgsConstructor;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/IndexCache.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/IndexCache.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/IndexCache.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/IndexCache.java
index e47c951dd7c4d7aadf9c2983cb0212bed7c20a39..1eb07f601adfd5a6238751c5c0761e289ef35956 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/IndexCache.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/IndexCache.java
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.cache;
+package org.opengroup.osdu.indexer.common.cache;
import lombok.RequiredArgsConstructor;
import org.opengroup.osdu.core.common.cache.RedisCache;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/SchemaCache.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/SchemaCache.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/SchemaCache.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/SchemaCache.java
index 48d76fabf2aa7a35c8c5d81c87148f97193cb7d5..a48b89914a6bce854883a31e36bdaca4b514dcf5 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/cache/SchemaCache.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/cache/SchemaCache.java
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.cache;
+package org.opengroup.osdu.indexer.common.cache;
import lombok.RequiredArgsConstructor;
import org.opengroup.osdu.core.common.cache.RedisCache;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/CorePlusConfigurationProperties.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/CorePlusConfigurationProperties.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/CorePlusConfigurationProperties.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/CorePlusConfigurationProperties.java
index f729637211e52234caf5c3bfeb33a1e51de1088a..ee6d56745bd646a806ff88a72f4a89dc3fdce3a7 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/CorePlusConfigurationProperties.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/CorePlusConfigurationProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.di;
+package org.opengroup.osdu.indexer.common.di;
import lombok.Getter;
import lombok.Setter;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/ElasticSearchConfig.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/ElasticSearchConfig.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/ElasticSearchConfig.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/ElasticSearchConfig.java
index e304a17edb3e7819a27e005c44a2053cc1c3df43..134145ade7847b0692375da0c4045c173cd83833 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/ElasticSearchConfig.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/ElasticSearchConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.di;
+package org.opengroup.osdu.indexer.common.di;
import org.opengroup.osdu.core.common.partition.IPartitionProvider;
import org.opengroup.osdu.core.common.partition.IPropertyResolver;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/EntitlementsClientFactory.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/EntitlementsClientFactory.java
similarity index 97%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/EntitlementsClientFactory.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/EntitlementsClientFactory.java
index 24f9cc19ff4f51d87bac4f31608eea9b0bb50ca7..8f4a08ff454b6d28e8a5d6815ba35293e414206a 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/di/EntitlementsClientFactory.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/di/EntitlementsClientFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.di;
+package org.opengroup.osdu.indexer.common.di;
import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig;
import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/package-info.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/package-info.java
similarity index 93%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/package-info.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/package-info.java
index 391c0383a79f364f2ad3465bb3842abcc9d51dfc..acd2d81e4ffbbd1ff2129a72f5d0b0ee68f0e590 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/package-info.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/package-info.java
@@ -18,4 +18,4 @@
* This module is used to provide common bean configuration, for both web app context that serves user request, and non-web app context that process indexing
* events.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common;
+package org.opengroup.osdu.indexer.common;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/JobStatusJsonSerializer.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/JobStatusJsonSerializer.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/JobStatusJsonSerializer.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/JobStatusJsonSerializer.java
index 01d88736ff10b20a61547db5931aa0b6868fad26..3b198f56b8af285982f55b77489afcdc0a3a6dad 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/JobStatusJsonSerializer.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/JobStatusJsonSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.publish;
+package org.opengroup.osdu.indexer.common.publish;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/ReprocessingTaskPublisher.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/ReprocessingTaskPublisher.java
similarity index 97%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/ReprocessingTaskPublisher.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/ReprocessingTaskPublisher.java
index 556cb9ad6b3b38253ffda4bb9866f62775b66a7d..86d652574c7b40df8d4048d9dc33b208d0719db1 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/ReprocessingTaskPublisher.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/ReprocessingTaskPublisher.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.publish;
+package org.opengroup.osdu.indexer.common.publish;
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
@@ -27,7 +27,7 @@ import org.opengroup.osdu.oqm.core.model.OqmDestination;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.oqm.core.model.OqmTopic;
import org.opengroup.osdu.indexer.model.Constants;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.config.MessagingConfigProperties;
+import org.opengroup.osdu.indexer.indexing.config.MessagingConfigProperties;
import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/StatusPublisherImpl.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/StatusPublisherImpl.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/StatusPublisherImpl.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/StatusPublisherImpl.java
index 9ebb0cd1bdf4bdaaa3f3f1076cc187a53e0b80f3..d0d3ffbd021351e62a412821ae93cdb612d3d339 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/publish/StatusPublisherImpl.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/publish/StatusPublisherImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.publish;
+package org.opengroup.osdu.indexer.common.publish;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -31,7 +31,7 @@ import org.opengroup.osdu.oqm.core.OqmDriver;
import org.opengroup.osdu.oqm.core.model.OqmDestination;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.oqm.core.model.OqmTopic;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.config.MessagingConfigProperties;
+import org.opengroup.osdu.indexer.indexing.config.MessagingConfigProperties;
import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
import org.springframework.stereotype.Component;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/util/ServiceAccountJwtGcpClientImpl.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/util/ServiceAccountJwtGcpClientImpl.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/util/ServiceAccountJwtGcpClientImpl.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/util/ServiceAccountJwtGcpClientImpl.java
index b229c290feb160c2207105c114055fe1d9771ca6..dbd49476c88be9744e075b00b350d0e5c0448ca4 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/common/util/ServiceAccountJwtGcpClientImpl.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/common/util/ServiceAccountJwtGcpClientImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.common.util;
+package org.opengroup.osdu.indexer.common.util;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/CustomContextConfiguration.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/CustomContextConfiguration.java
similarity index 92%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/CustomContextConfiguration.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/CustomContextConfiguration.java
index 8b903300a453e6143cd313d67c7ef502838b27e2..a46db7833b0f738bb35731840196c046f2405746 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/CustomContextConfiguration.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/CustomContextConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.config;
+package org.opengroup.osdu.indexer.indexing.config;
import java.util.Arrays;
import javax.annotation.PostConstruct;
@@ -23,8 +23,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.opengroup.osdu.indexer.IndexerApplication;
import org.opengroup.osdu.indexer.ServerletInitializer;
-import org.opengroup.osdu.indexer.provider.gcp.web.config.WebAppMainContextConfiguration;
-import org.opengroup.osdu.indexer.provider.gcp.web.security.CorePlusSecurityConfig;
+import org.opengroup.osdu.indexer.web.config.WebAppMainContextConfiguration;
+import org.opengroup.osdu.indexer.web.security.CorePlusSecurityConfig;
import org.opengroup.osdu.indexer.swagger.SwaggerConfiguration;
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/MessagingConfigProperties.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/MessagingConfigProperties.java
similarity index 94%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/MessagingConfigProperties.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/MessagingConfigProperties.java
index 384768395976742f72174fae415e52e4bbd46302..045dbd53ce14b43bf9c6427a8bb5bc986911297e 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/MessagingConfigProperties.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/MessagingConfigProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.config;
+package org.opengroup.osdu.indexer.indexing.config;
import lombok.Getter;
import lombok.Setter;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/ScopeModifierPostProcessor.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/ScopeModifierPostProcessor.java
similarity index 92%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/ScopeModifierPostProcessor.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/ScopeModifierPostProcessor.java
index f1b4ce0b80bbbd86d947b2f486fd97238b30a22a..cab567edcbabfd18152be52a5288553a9ad61345 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/config/ScopeModifierPostProcessor.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/config/ScopeModifierPostProcessor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.config;
+package org.opengroup.osdu.indexer.indexing.config;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.thread.ThreadScope;
+import org.opengroup.osdu.indexer.indexing.thread.ThreadScope;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/OqmSubscriberManager.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/OqmSubscriberManager.java
similarity index 98%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/OqmSubscriberManager.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/OqmSubscriberManager.java
index 7c2dea45260dd312a0e30a1cbe2f4c780d511544..52146e1525ac2a6fd1e42509eb3b28b7610afc42 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/OqmSubscriberManager.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/OqmSubscriberManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.initialization;
+package org.opengroup.osdu.indexer.indexing.initialization;
import javax.annotation.Nullable;
import lombok.RequiredArgsConstructor;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/TenantSubscriberConfiguration.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/TenantSubscriberConfiguration.java
similarity index 85%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/TenantSubscriberConfiguration.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/TenantSubscriberConfiguration.java
index c6395324c717630e4dfee53c88c822ddf58b7136..4bf5ab4ad74a96c5853597cd7b3350f821c023b0 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/initialization/TenantSubscriberConfiguration.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/initialization/TenantSubscriberConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.initialization;
+package org.opengroup.osdu.indexer.indexing.initialization;
import javax.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
@@ -26,12 +26,12 @@ import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory;
import org.opengroup.osdu.oqm.core.model.OqmSubscriberThroughput;
import org.opengroup.osdu.indexer.api.RecordIndexerApi;
import org.opengroup.osdu.indexer.api.ReindexApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.config.MessagingConfigProperties;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.processing.RecordsChangedMessageReceiver;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.processing.ReindexMessageReceiver;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.processing.ReprocessorMessageReceiver;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.processing.SchemaChangedMessageReceiver;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.config.MessagingConfigProperties;
+import org.opengroup.osdu.indexer.indexing.processing.RecordsChangedMessageReceiver;
+import org.opengroup.osdu.indexer.indexing.processing.ReindexMessageReceiver;
+import org.opengroup.osdu.indexer.indexing.processing.ReprocessorMessageReceiver;
+import org.opengroup.osdu.indexer.indexing.processing.SchemaChangedMessageReceiver;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
import org.springframework.stereotype.Component;
/**
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/package-info.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/package-info.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/package-info.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/package-info.java
index 4cc667aa15649f7e9022b31c829f95078f479270..290b511ee0e8bcadab7f729b190f9983265dabdc 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/package-info.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/package-info.java
@@ -22,4 +22,4 @@
* common code is overriden with help of BeanFactoryPostProcessor.
* </p>
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing;
+package org.opengroup.osdu.indexer.indexing;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiver.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiver.java
similarity index 95%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiver.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiver.java
index 99c63c2a284851c101d5b7b7e084e35e1d74287e..1b894c1e2a276d0b54baf7158ffd53f231e8229d 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiver.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
@@ -26,8 +26,8 @@ import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.oqm.core.model.OqmAckReplier;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.oqm.core.model.OqmMessageReceiver;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.thread.ThreadScopeContextHolder;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.thread.ThreadScopeContextHolder;
import javax.validation.constraints.NotNull;
import java.util.Optional;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiver.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiver.java
similarity index 93%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiver.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiver.java
index 8c8a685e17f4a497e311e8cca77600c00a598537..15ea5575bd102fcfbab5522f663dae9ed2c0672a 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiver.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import java.time.LocalDateTime;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.indexer.JobStatus;
import org.opengroup.osdu.core.common.model.search.RecordChangedMessages;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.RecordIndexerApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
import org.springframework.http.ResponseEntity;
@Slf4j
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReindexMessageReceiver.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReindexMessageReceiver.java
similarity index 93%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReindexMessageReceiver.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReindexMessageReceiver.java
index 7dd91b4c516555f94be8f9f0dcc56c7cb27b74bd..ff8df1be22cdffb36452a1d2db546c6292f230de 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReindexMessageReceiver.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReindexMessageReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import java.time.LocalDateTime;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.indexer.JobStatus;
import org.opengroup.osdu.core.common.model.search.RecordChangedMessages;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.RecordIndexerApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
import org.springframework.http.ResponseEntity;
@Slf4j
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiver.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiver.java
similarity index 92%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiver.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiver.java
index 793b17cbbe9e7b6034321b0b1a139b6affc03b4f..8db1921ede386d7abab35a006498629cd6143653 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiver.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.ReindexApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
import org.springframework.http.ResponseEntity;
@Slf4j
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/SchemaChangedMessageReceiver.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/SchemaChangedMessageReceiver.java
similarity index 94%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/SchemaChangedMessageReceiver.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/SchemaChangedMessageReceiver.java
index a1003f8d5a1030e8bf2f8e41c68a12fe19f0944f..c28638a177078a952130419d68e8c57d6b23e591 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/SchemaChangedMessageReceiver.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/processing/SchemaChangedMessageReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import com.google.gson.Gson;
import java.io.IOException;
@@ -25,7 +25,7 @@ import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.core.common.model.indexer.SchemaChangedMessages;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.RecordIndexerApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
import org.springframework.http.ResponseEntity;
@Slf4j
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/scope/ThreadDpsHeaders.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/scope/ThreadDpsHeaders.java
similarity index 90%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/scope/ThreadDpsHeaders.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/scope/ThreadDpsHeaders.java
index cead33ae8cbb289816c1473611379b6a5ddb39da..f68b372a38d1cb4abf729b4f2c3347384bfd7a9f 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/scope/ThreadDpsHeaders.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/scope/ThreadDpsHeaders.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.scope;
+package org.opengroup.osdu.indexer.indexing.scope;
import static org.springframework.context.annotation.ScopedProxyMode.TARGET_CLASS;
@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.config.ScopeModifierPostProcessor;
+import org.opengroup.osdu.indexer.indexing.config.ScopeModifierPostProcessor;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScope.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScope.java
similarity index 97%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScope.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScope.java
index c2e5fef7361b8477f2fc606b7025d9ccd21769d8..3e7670357e259321afb71a00e4ed9ef8527658d7 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScope.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScope.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.thread;
+package org.opengroup.osdu.indexer.indexing.thread;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeAttributes.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeAttributes.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeAttributes.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeAttributes.java
index 7a9ac113c207b536d3b5df147dd3e22771b35583..fcb554219d3b4c6efc2e9a44d7f33584100176c9 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeAttributes.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeAttributes.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.thread;
+package org.opengroup.osdu.indexer.indexing.thread;
import java.util.HashMap;
import java.util.LinkedHashMap;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeContextHolder.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeContextHolder.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeContextHolder.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeContextHolder.java
index 24d7c2ef69103f9181a620ac7e88bcd1f464cb26..da453b4bf664ea2eb30de801d7df536b43ea86fa 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/indexing/thread/ThreadScopeContextHolder.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/indexing/thread/ThreadScopeContextHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.thread;
+package org.opengroup.osdu.indexer.indexing.thread;
public class ThreadScopeContextHolder {
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/config/WebAppMainContextConfiguration.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/config/WebAppMainContextConfiguration.java
similarity index 97%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/config/WebAppMainContextConfiguration.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/config/WebAppMainContextConfiguration.java
index ffb314b7e171ffed3fd0d6093a58106f98aa22c1..53edffe77ef4d0b855dc16a20719f478158fb9d6 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/config/WebAppMainContextConfiguration.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/config/WebAppMainContextConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.web.config;
+package org.opengroup.osdu.indexer.web.config;
import java.util.Arrays;
import javax.annotation.PostConstruct;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/di/TenantInfoService.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/di/TenantInfoService.java
similarity index 94%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/di/TenantInfoService.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/di/TenantInfoService.java
index 07570f46ccc0e0026684b08913feeb148cfb2344..ec78f382aa09a27c8728966a1674c16344260210 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/di/TenantInfoService.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/di/TenantInfoService.java
@@ -1,4 +1,4 @@
-package org.opengroup.osdu.indexer.provider.gcp.web.di;
+package org.opengroup.osdu.indexer.web.di;
import java.util.ArrayList;
import java.util.List;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/middleware/IndexFilter.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/middleware/IndexFilter.java
similarity index 98%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/middleware/IndexFilter.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/middleware/IndexFilter.java
index 2ff2b6ba6137c89f1e9381be873dc430ad69edc4..0cea96a60bacad5ca6e2d3ed5341a1efd51fcde0 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/middleware/IndexFilter.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/middleware/IndexFilter.java
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.web.middleware;
+package org.opengroup.osdu.indexer.web.middleware;
import com.google.common.base.Strings;
import java.io.IOException;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/package-info.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/package-info.java
similarity index 94%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/package-info.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/package-info.java
index 45e225e75466a19c067498cbfb312e058771dcda..0f1df7119c7e2f48b17dce427927988a3787303f 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/package-info.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/package-info.java
@@ -18,4 +18,4 @@
* This module is used to keep minimum required bean configuration in the web environment required for request processing. All beans will be placed in a
* separate context.
*/
-package org.opengroup.osdu.indexer.provider.gcp.web;
+package org.opengroup.osdu.indexer.web;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/security/CorePlusSecurityConfig.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/security/CorePlusSecurityConfig.java
similarity index 96%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/security/CorePlusSecurityConfig.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/security/CorePlusSecurityConfig.java
index 171255d08537e0457c14b13a33bb203b07c507d4..c50e6b173964ed1a7377d116ec582a3edbe4a5ff 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/security/CorePlusSecurityConfig.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/security/CorePlusSecurityConfig.java
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.web.security;
+package org.opengroup.osdu.indexer.web.security;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/AppExceptionHandler.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/AppExceptionHandler.java
similarity index 97%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/AppExceptionHandler.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/AppExceptionHandler.java
index a766de2693d24cbc2ac119796e198d2881692363..32c483fed9b31402687149c5586c9a073787f380 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/AppExceptionHandler.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/AppExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.opengroup.osdu.indexer.provider.gcp.web.util;
+package org.opengroup.osdu.indexer.web.util;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
diff --git a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/RequestInfoImpl.java b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/RequestInfoImpl.java
similarity index 98%
rename from indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/RequestInfoImpl.java
rename to indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/RequestInfoImpl.java
index 56cbdeeaf55bb2e0eb2047de6b8865a9eecff0e2..b3449abdf8afe69496b65dfe4b140d38ce390d2c 100644
--- a/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/provider/gcp/web/util/RequestInfoImpl.java
+++ b/indexer-core-plus/src/main/java/org/opengroup/osdu/indexer/web/util/RequestInfoImpl.java
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.web.util;
+package org.opengroup.osdu.indexer.web.util;
import static org.opengroup.osdu.core.common.model.http.DpsHeaders.AUTHORIZATION;
diff --git a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiverTest.java b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiverTest.java
similarity index 94%
rename from indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiverTest.java
rename to indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiverTest.java
index 0e65cb626993d58c3de17d74faac2c235e690131..79630eeb4f6e8b9276d2dfa5c44e314a66bce7de 100644
--- a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/IndexerOqmMessageReceiverTest.java
+++ b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/IndexerOqmMessageReceiverTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
@@ -33,7 +33,7 @@ import org.mockito.Mockito;
import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.oqm.core.model.OqmAckReplier;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
@RunWith(Theories.class)
public class IndexerOqmMessageReceiverTest {
diff --git a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReadFromFileUtil.java b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReadFromFileUtil.java
similarity index 95%
rename from indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReadFromFileUtil.java
rename to indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReadFromFileUtil.java
index 7f1b7d5a7ec160b17b6fa0b78eb8916490b222d0..c06fda79115d65ef1ed71a9c98b355d5cf222f1d 100644
--- a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReadFromFileUtil.java
+++ b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReadFromFileUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
diff --git a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiverTest.java b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiverTest.java
similarity index 93%
rename from indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiverTest.java
rename to indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiverTest.java
index 4d5f1133a10f377139fbd5116d2d7c06bdaa6f05..ff965c2bf933a760ec090f22528ecc96a41fb5dd 100644
--- a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/RecordsChangedMessageReceiverTest.java
+++ b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/RecordsChangedMessageReceiverTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import static org.mockito.Mockito.verify;
@@ -32,7 +32,7 @@ import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.oqm.core.model.OqmAckReplier;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.RecordIndexerApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
@RunWith(Theories.class)
public class RecordsChangedMessageReceiverTest {
diff --git a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiverTest.java b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiverTest.java
similarity index 93%
rename from indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiverTest.java
rename to indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiverTest.java
index 107603cea07644f26a724baa89a4971edd985c04..a856669cb0b48b3e04765139367397fe39cc6883 100644
--- a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/provider/gcp/indexing/processing/ReprocessorMessageReceiverTest.java
+++ b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/indexing/processing/ReprocessorMessageReceiverTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.opengroup.osdu.indexer.provider.gcp.indexing.processing;
+package org.opengroup.osdu.indexer.indexing.processing;
import static org.mockito.Mockito.verify;
@@ -32,7 +32,7 @@ import org.opengroup.osdu.auth.TokenProvider;
import org.opengroup.osdu.oqm.core.model.OqmAckReplier;
import org.opengroup.osdu.oqm.core.model.OqmMessage;
import org.opengroup.osdu.indexer.api.ReindexApi;
-import org.opengroup.osdu.indexer.provider.gcp.indexing.scope.ThreadDpsHeaders;
+import org.opengroup.osdu.indexer.indexing.scope.ThreadDpsHeaders;
@RunWith(Theories.class)
public class ReprocessorMessageReceiverTest {
diff --git a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
index ddda259b30974da2e4495a3db0f023cc2abc57c1..a7ae62d7d698c9753d65b84eae6b3a7d90b811ae 100644
--- a/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
+++ b/indexer-core-plus/src/test/java/org/opengroup/osdu/indexer/middleware/IndexFilterTest.java
@@ -24,7 +24,7 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.indexer.provider.gcp.web.middleware.IndexFilter;
+import org.opengroup.osdu.indexer.web.middleware.IndexFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;