diff --git a/kvmain/src/main/java/oracle/nosql/audit/AuditContext.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/audit/AuditContext.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/audit/AuditContext.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/audit/AuditContext.java
diff --git a/kvmain/src/main/java/oracle/nosql/audit/Auditor.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/audit/Auditor.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/audit/Auditor.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/audit/Auditor.java
diff --git a/kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditContext.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditContext.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditContext.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditContext.java
diff --git a/kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditValidator.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditValidator.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditValidator.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditValidator.java
diff --git a/kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditor.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditor.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/audit/oci/OCIAuditor.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/audit/oci/OCIAuditor.java
diff --git a/kvmain/src/main/java/oracle/nosql/health/HealthStatus.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/health/HealthStatus.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/health/HealthStatus.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/health/HealthStatus.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ConnectivityTrack.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ConnectivityTrack.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ConnectivityTrack.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ConnectivityTrack.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/HostPort.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/HostPort.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/HostPort.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/HostPort.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/HttpRequest.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpRequest.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/HttpRequest.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpRequest.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/HttpResponse.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpResponse.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/HttpResponse.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpResponse.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/HttpServerHealth.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpServerHealth.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/HttpServerHealth.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/HttpServerHealth.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/RetryHelper.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/RetryHelper.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/RetryHelper.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/RetryHelper.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/SCResolver.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/SCResolver.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/SCResolver.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/SCResolver.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ServiceDirectory.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ServiceDirectory.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ServiceDirectory.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ServiceDirectory.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/ErrorCode.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ErrorCode.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/ErrorCode.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ErrorCode.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/ErrorResponse.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ErrorResponse.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/ErrorResponse.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ErrorResponse.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/ExceptionHandler.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ExceptionHandler.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/ExceptionHandler.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ExceptionHandler.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/ProcessExitCode.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ProcessExitCode.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/ProcessExitCode.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ProcessExitCode.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/ProcessFault.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ProcessFault.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/ProcessFault.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/ProcessFault.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/RequestFault.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/RequestFault.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/RequestFault.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/RequestFault.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/RequestFaultException.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/RequestFaultException.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/RequestFaultException.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/RequestFaultException.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/fault/package.html b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/package.html
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/fault/package.html
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/fault/package.html
diff --git a/kvmain/src/main/java/oracle/nosql/util/filter/Rule.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/filter/Rule.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/filter/Rule.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/filter/Rule.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/http/HttpConstants.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/http/HttpConstants.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/http/HttpConstants.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/http/HttpConstants.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ph/HealthReportAgent.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/HealthReportAgent.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ph/HealthReportAgent.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/HealthReportAgent.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ph/HealthStatus.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/HealthStatus.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ph/HealthStatus.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/HealthStatus.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ph/URL.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/URL.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ph/URL.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/URL.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ph/record/AbstractHealthRecord.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/record/AbstractHealthRecord.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ph/record/AbstractHealthRecord.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/record/AbstractHealthRecord.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ph/record/InstanceHealthRecord.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/record/InstanceHealthRecord.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ph/record/InstanceHealthRecord.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ph/record/InstanceHealthRecord.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ssl/SSLConfig.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ssl/SSLConfig.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ssl/SSLConfig.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ssl/SSLConfig.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/ssl/SSLConnectionHandler.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/ssl/SSLConnectionHandler.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/ssl/SSLConnectionHandler.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/ssl/SSLConnectionHandler.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/DdlHistoryEntry.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/DdlHistoryEntry.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/DdlHistoryEntry.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/DdlHistoryEntry.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/DropInputs.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/DropInputs.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/DropInputs.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/DropInputs.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/IndexInfo.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/IndexInfo.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/IndexInfo.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/IndexInfo.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/PeakUsage.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/PeakUsage.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/PeakUsage.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/PeakUsage.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/ReplicaInfo.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/ReplicaInfo.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/ReplicaInfo.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/ReplicaInfo.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/ReplicaStats.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/ReplicaStats.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/ReplicaStats.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/ReplicaStats.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/StoreInfo.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/StoreInfo.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/StoreInfo.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/StoreInfo.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableCollection.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableCollection.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableCollection.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableCollection.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableDDLInputs.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableDDLInputs.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableDDLInputs.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableDDLInputs.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableHistoryInfo.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableHistoryInfo.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableHistoryInfo.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableHistoryInfo.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableInfo.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableInfo.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableInfo.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableInfo.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableLimits.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableLimits.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableLimits.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableLimits.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableRequestLimits.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableRequestLimits.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableRequestLimits.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableRequestLimits.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TableUsage.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableUsage.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TableUsage.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TableUsage.java
diff --git a/kvmain/src/main/java/oracle/nosql/util/tmi/TenantLimits.java b/httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TenantLimits.java
similarity index 100%
rename from kvmain/src/main/java/oracle/nosql/util/tmi/TenantLimits.java
rename to httpproxy/httpproxy/src/main/java/oracle/nosql/util/tmi/TenantLimits.java