diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..022b84144a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..b25cfedaaa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Ignore Gradle project-specific cache directory
+.DS_Store
+.idea
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/.gradle/6.5/executionHistory/executionHistory.bin b/.gradle/6.5/executionHistory/executionHistory.bin
index 5f21b06143..b8c990d5bc 100644
Binary files a/.gradle/6.5/executionHistory/executionHistory.bin and b/.gradle/6.5/executionHistory/executionHistory.bin differ
diff --git a/.gradle/6.5/executionHistory/executionHistory.lock b/.gradle/6.5/executionHistory/executionHistory.lock
index 6bb57eca03..2ba07f7f99 100644
Binary files a/.gradle/6.5/executionHistory/executionHistory.lock and b/.gradle/6.5/executionHistory/executionHistory.lock differ
diff --git a/.gradle/6.5/fileHashes/fileHashes.bin b/.gradle/6.5/fileHashes/fileHashes.bin
index 2b1f31bcfd..aecbcb4270 100644
Binary files a/.gradle/6.5/fileHashes/fileHashes.bin and b/.gradle/6.5/fileHashes/fileHashes.bin differ
diff --git a/.gradle/6.5/fileHashes/fileHashes.lock b/.gradle/6.5/fileHashes/fileHashes.lock
index b5a4b70d93..dcd05b66a6 100644
Binary files a/.gradle/6.5/fileHashes/fileHashes.lock and b/.gradle/6.5/fileHashes/fileHashes.lock differ
diff --git a/.gradle/6.5/fileHashes/resourceHashesCache.bin b/.gradle/6.5/fileHashes/resourceHashesCache.bin
index 10d0c22b97..96f9d1d85b 100644
Binary files a/.gradle/6.5/fileHashes/resourceHashesCache.bin and b/.gradle/6.5/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/6.5/javaCompile/classAnalysis.bin b/.gradle/6.5/javaCompile/classAnalysis.bin
index 9e2b7c6fa0..b35a31ed32 100644
Binary files a/.gradle/6.5/javaCompile/classAnalysis.bin and b/.gradle/6.5/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/6.5/javaCompile/jarAnalysis.bin b/.gradle/6.5/javaCompile/jarAnalysis.bin
index 399700e680..4851b241a3 100644
Binary files a/.gradle/6.5/javaCompile/jarAnalysis.bin and b/.gradle/6.5/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/6.5/javaCompile/javaCompile.lock b/.gradle/6.5/javaCompile/javaCompile.lock
index afdffc6612..0779ad4493 100644
Binary files a/.gradle/6.5/javaCompile/javaCompile.lock and b/.gradle/6.5/javaCompile/javaCompile.lock differ
diff --git a/.gradle/6.5/javaCompile/taskHistory.bin b/.gradle/6.5/javaCompile/taskHistory.bin
index c4b3da9964..c4d95eca62 100644
Binary files a/.gradle/6.5/javaCompile/taskHistory.bin and b/.gradle/6.5/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 99d26152d3..a78b7401f9 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 865b63fe24..a7639e2149 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/settings.gradle b/settings.gradle
index 9bb227e8ec..e1d1801347 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,7 @@ rootProject.name = 'transformation-instance'
 
 include 'situp-api'
 include 'situp-plugins'
-include 'situp-core'
\ No newline at end of file
+include 'situp-core'
+include 'situp-plugins:common'
+include 'situp-plugins:apmtracesource'
+include 'situp-plugins:elasticsearch'
\ No newline at end of file
diff --git a/situp-core/build.gradle b/situp-core/build.gradle
index 1a7535d294..eda32ca019 100644
--- a/situp-core/build.gradle
+++ b/situp-core/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compile project(':situp-api')
-    compile project(':situp-plugins')
+    compile project(':situp-plugins:common')
     implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
     implementation "javax.validation:validation-api:${versionMap.validation_api}"
diff --git a/situp-plugins/apmtracesource/build.gradle b/situp-plugins/apmtracesource/build.gradle
new file mode 100644
index 0000000000..d67b35cce0
--- /dev/null
+++ b/situp-plugins/apmtracesource/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id 'java'
+    id 'jacoco'
+}
+
+dependencies {
+    compile project(':situp-api')
+    compile project(':situp-plugins:common')
+    implementation 'io.netty:netty-all:4.1.51.Final'
+    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
+}
\ No newline at end of file
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmSpanProcessor.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmSpanProcessor.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmSpanProcessor.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmSpanProcessor.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceRequestProcessor.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceRequestProcessor.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceRequestProcessor.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceRequestProcessor.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java
index 659006c7ad..0c7f852e77 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java
+++ b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/ApmTraceSource.java
@@ -1,11 +1,11 @@
 package com.amazon.situp.plugins.source.apmtracesource;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.PluginSetting;
 import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.plugins.source.apmtracesource.http.server.NettyHttpConfig;
 import com.amazon.situp.plugins.source.apmtracesource.http.server.NettyHttpServer;
 
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/common/DaemonThreadFactory.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/common/DaemonThreadFactory.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/common/DaemonThreadFactory.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/common/DaemonThreadFactory.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpConfig.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpConfig.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpConfig.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpConfig.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpServer.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpServer.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpServer.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/NettyHttpServer.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerHandler.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerHandler.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerHandler.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerHandler.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerRequestProcessor.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerRequestProcessor.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerRequestProcessor.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerRequestProcessor.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerResponseUtil.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerResponseUtil.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerResponseUtil.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerResponseUtil.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerTrafficShapingHandler.java b/situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerTrafficShapingHandler.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerTrafficShapingHandler.java
rename to situp-plugins/apmtracesource/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/server/ServerTrafficShapingHandler.java
diff --git a/situp-plugins/build.gradle b/situp-plugins/build.gradle
index 74b055bd52..e69de29bb2 100644
--- a/situp-plugins/build.gradle
+++ b/situp-plugins/build.gradle
@@ -1,79 +0,0 @@
-buildscript {
-    ext {
-        es_version = System.getProperty("es.version", "7.8.0")
-        es_group = "org.elasticsearch"
-        distribution = 'oss-zip'
-    }
-
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-
-    dependencies {
-        classpath "${es_group}.gradle:build-tools:${es_version}"
-        //Uncomment below dependency for publishing
-        //classpath 'com.amazonaws:aws-java-sdk-core:1.11.5'
-    }
-}
-
-plugins {
-    id 'java'
-    id 'jacoco'
-}
-apply plugin: 'elasticsearch.testclusters'
-apply plugin: 'elasticsearch.build'
-apply plugin: 'elasticsearch.rest-test'
-
-// To pass elasticsearch plugin check
-ext {
-    licenseFile = rootProject.file('LICENSE.TXT')
-    noticeFile = rootProject.file('NOTICE.TXT')
-}
-
-dependencies {
-    compile project(':situp-api')
-    implementation 'io.netty:netty-all:4.1.51.Final'
-    implementation "org.elasticsearch.client:elasticsearch-rest-client:${es_version}"
-    implementation "org.elasticsearch:elasticsearch:${es_version}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
-    implementation "org.reflections:reflections:${versionMap.reflections}"
-    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    testImplementation("junit:junit:${versionMap.junit}") {
-        exclude group:'org.hamcrest' // workaround for jarHell
-    }
-    testImplementation "org.elasticsearch.test:framework:${es_version}"
-}
-// Workaround for Werror
-compileJava.options.warnings = false
-
-// Resolve dependency conflict between ES sink and main project
-configurations.all {
-    resolutionStrategy {
-        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
-        force 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
-        force 'com.fasterxml.jackson.core:jackson-core:2.11.1'
-        force 'com.google.guava:guava:29.0-jre'
-        force 'org.apache.bval:bval-jsr:2.0.4'
-        force 'junit:junit:4.13'
-    }
-}
-
-integTest {}
-
-testClusters.integTest {
-    testDistribution = "OSS"
-}
-
-integTest.runner {
-    systemProperty 'tests.security.manager', 'false'
-}
-
-checkstyleMain.ignoreFailures = true
-checkstyleTest.ignoreFailures = true
-forbiddenApis.ignoreFailures = true
-testingConventions.enabled = false
-licenseHeaders.enabled = false
-dependencyLicenses.enabled = false
-thirdPartyAudit.enabled = false
-validateNebulaPom.enabled = false
\ No newline at end of file
diff --git a/situp-plugins/common/build.gradle b/situp-plugins/common/build.gradle
new file mode 100644
index 0000000000..31f084abdf
--- /dev/null
+++ b/situp-plugins/common/build.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'java'
+    id 'jacoco'
+}
+dependencies {
+    compile project(':situp-api')
+    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
+    implementation "org.reflections:reflections:${versionMap.reflections}"
+    testImplementation "junit:junit:${versionMap.junit}"
+}
\ No newline at end of file
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/PluginException.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginException.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/PluginException.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginException.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/PluginFactory.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginFactory.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/PluginFactory.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginFactory.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/PluginRepository.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginRepository.java
similarity index 98%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/PluginRepository.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginRepository.java
index 2cafd809b0..4b4585906c 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/PluginRepository.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/PluginRepository.java
@@ -19,7 +19,7 @@
  * TODO Add capability to discover custom new plugins
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public final class PluginRepository {
+public final class  PluginRepository {
     private static final String DEFAULT_PLUGINS_CLASSPATH = "com.amazon.situp.plugins";
     private static final Map<String, Class<Source>> SOURCES = new HashMap<>();
     private static final Map<String, Class<Buffer>> BUFFERS = new HashMap<>();
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/BufferFactory.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/BufferFactory.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/BufferFactory.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/BufferFactory.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java
index cb9e4ed770..359fc6e4df 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/buffer/UnboundedInMemoryBuffer.java
@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.buffer;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java
index 156fd77bf0..a9db5c9382 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/NoOpProcessor.java
@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.processor;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.processor.Processor;
+import com.amazon.situp.model.record.Record;
 
 import java.util.Collection;
 
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java
index fa28be09b9..d4a9ec5f8a 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/ProcessorFactory.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.processor;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.plugins.PluginFactory;
 import com.amazon.situp.plugins.PluginRepository;
-import com.amazon.situp.model.processor.Processor;
 
 @SuppressWarnings({"rawtypes"})
 public class ProcessorFactory extends PluginFactory {
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java
similarity index 99%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java
index d1d48dc301..502cd08e19 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StatelessServiceMapTraceProcessor.java
@@ -1,11 +1,12 @@
 package com.amazon.situp.plugins.processor;
 
+import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.record.RecordMetadata;
-import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.PluginType;
-import com.amazon.situp.model.processor.Processor;
+
 import java.util.Collection;
 import java.util.stream.Collectors;
 
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java
index fc44cb11e2..0b9580103e 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/processor/StringProcessor.java
@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.processor;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.processor.Processor;
+import com.amazon.situp.model.record.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/FileSink.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/FileSink.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/FileSink.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/FileSink.java
index c31717093c..59c6f1ca92 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/FileSink.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/FileSink.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.io.BufferedWriter;
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java
index 8e40f3d450..dd37f9f8ca 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/SinkFactory.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.sink.Sink;
 import com.amazon.situp.plugins.PluginFactory;
 import com.amazon.situp.plugins.PluginRepository;
-import com.amazon.situp.model.sink.Sink;
 
 @SuppressWarnings({"rawtypes"})
 public class SinkFactory extends PluginFactory {
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java
index cdecf51e2d..fccb8f4eeb 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/sink/StdOutSink.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.util.Collection;
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/FileSource.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/FileSource.java
similarity index 99%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/FileSource.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/FileSource.java
index 9342819dce..e4a7a9af0e 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/FileSource.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/FileSource.java
@@ -62,4 +62,4 @@ public void start(final Buffer<Record<String>> buffer) {
     public void stop() {
         isStopRequested = true;
     }
-}
+}
\ No newline at end of file
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java
similarity index 99%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java
index 5340c653cd..7d84df21be 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/SourceFactory.java
@@ -11,4 +11,4 @@ public class SourceFactory extends PluginFactory {
     public static Source newSource(final PluginSetting pluginSetting) {
         return (Source) newPlugin(pluginSetting, PluginRepository.getSourceClass(pluginSetting.getName()));
     }
-}
+}
\ No newline at end of file
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/StdInSource.java b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/StdInSource.java
similarity index 99%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/source/StdInSource.java
rename to situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/StdInSource.java
index e7ce0039c3..580947379e 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/StdInSource.java
+++ b/situp-plugins/common/src/main/java/com/amazon/situp/plugins/source/StdInSource.java
@@ -52,4 +52,4 @@ public void start(final Buffer<Record<String>> buffer) {
     public void stop() {
         isStopRequested = true;
     }
-}
+}
\ No newline at end of file
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java
index ac937448f9..e590eb1c0f 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/ConstructorLessComponent.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins;
 
 import com.amazon.situp.model.PluginType;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.buffer.Buffer;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
 
 @SitupPlugin(name = "junit-test", type = PluginType.SOURCE)
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/PluginFactoryTests.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/PluginFactoryTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/PluginFactoryTests.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/PluginFactoryTests.java
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/buffer/BufferFactoryTests.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/buffer/BufferFactoryTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/buffer/BufferFactoryTests.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/buffer/BufferFactoryTests.java
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java
index 3a7f577c86..0c3e0346e4 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/processor/ProcessorFactoryTests.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.processor;
 
 import com.amazon.situp.model.configuration.PluginSetting;
+import com.amazon.situp.model.processor.Processor;
 import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.plugins.sink.SinkFactory;
-import com.amazon.situp.model.processor.Processor;
 import org.junit.Test;
 
 import java.util.HashMap;
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java
index 3f37dfa53c..8f76c26fca 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/SinkFactoryTests.java
@@ -1,8 +1,8 @@
 package com.amazon.situp.plugins.sink;
 
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.model.sink.Sink;
+import com.amazon.situp.plugins.PluginException;
 import org.junit.Test;
 
 import java.util.HashMap;
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/TestSink.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/TestSink.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/sink/TestSink.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/TestSink.java
index ba89dbcd3e..e123869c1b 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/TestSink.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/sink/TestSink.java
@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.sink;
 
 
-import com.amazon.situp.model.record.Record;
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.Configuration;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.sink.Sink;
 
 import java.util.ArrayList;
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java
index d5afda0b66..1588e42c45 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/SourceFactoryTests.java
@@ -1,8 +1,8 @@
 package com.amazon.situp.plugins.source;
 
 import com.amazon.situp.model.configuration.PluginSetting;
-import com.amazon.situp.plugins.PluginException;
 import com.amazon.situp.model.source.Source;
+import com.amazon.situp.plugins.PluginException;
 import org.junit.Test;
 
 import java.util.HashMap;
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/source/TestSource.java b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/TestSource.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/source/TestSource.java
rename to situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/TestSource.java
index 0d60b1a427..cc1bcfe8c1 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/source/TestSource.java
+++ b/situp-plugins/common/src/test/java/com/amazon/situp/plugins/source/TestSource.java
@@ -1,10 +1,10 @@
 package com.amazon.situp.plugins.source;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
-import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.buffer.Buffer;
 import com.amazon.situp.model.configuration.Configuration;
-import com.amazon.situp.model.PluginType;
+import com.amazon.situp.model.record.Record;
 import com.amazon.situp.model.source.Source;
 
 import java.util.Iterator;
diff --git a/situp-plugins/elasticsearch/build.gradle b/situp-plugins/elasticsearch/build.gradle
new file mode 100644
index 0000000000..e42fc87b7c
--- /dev/null
+++ b/situp-plugins/elasticsearch/build.gradle
@@ -0,0 +1,77 @@
+buildscript {
+    ext {
+        es_version = System.getProperty("es.version", "7.8.0")
+        es_group = "org.elasticsearch"
+        distribution = 'oss-zip'
+    }
+
+    repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+
+    dependencies {
+        classpath "${es_group}.gradle:build-tools:${es_version}"
+    }
+}
+
+plugins {
+    id 'java'
+    id 'jacoco'
+}
+apply plugin: 'elasticsearch.testclusters'
+apply plugin: 'elasticsearch.build'
+apply plugin: 'elasticsearch.rest-test'
+
+// To pass elasticsearch plugin check
+ext {
+    licenseFile = rootProject.file('LICENSE')
+    noticeFile = rootProject.file('NOTICE')
+}
+
+dependencies {
+    compile project(':situp-api')
+    compile project(':situp-plugins:common')
+    implementation "org.elasticsearch.client:elasticsearch-rest-client:${es_version}"
+    implementation "org.elasticsearch:elasticsearch:${es_version}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${versionMap.jackson_databind}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versionMap.jackson_dataformat_yaml}"
+    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+    testImplementation("junit:junit:${versionMap.junit}") {
+        exclude group:'org.hamcrest' // workaround for jarHell
+    }
+    testImplementation "org.elasticsearch.test:framework:${es_version}"
+}
+
+// Workaround for Werror
+compileJava.options.warnings = false
+
+// Resolve dependency conflict between ES sink and main project
+configurations.all {
+    resolutionStrategy {
+        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
+        force 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
+        force 'com.fasterxml.jackson.core:jackson-core:2.11.1'
+        force 'com.google.guava:guava:29.0-jre'
+        force 'org.apache.bval:bval-jsr:2.0.4'
+        force 'junit:junit:4.13'
+    }
+}
+
+integTest {}
+
+testClusters.integTest {
+    testDistribution = "OSS"
+}
+
+integTest.runner {
+    systemProperty 'tests.security.manager', 'false'
+}
+
+checkstyleMain.ignoreFailures = true
+checkstyleTest.ignoreFailures = true
+forbiddenApis.ignoreFailures = true
+testingConventions.enabled = false
+licenseHeaders.enabled = false
+dependencyLicenses.enabled = false
+thirdPartyAudit.enabled = false
+validateNebulaPom.enabled = false
\ No newline at end of file
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionConfiguration.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionConfiguration.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionConfiguration.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionConfiguration.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java
index 451663ef8c..2ef5263f53 100644
--- a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java
+++ b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSink.java
@@ -1,9 +1,9 @@
 package com.amazon.situp.plugins.sink.elasticsearch;
 
+import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.annotations.SitupPlugin;
 import com.amazon.situp.model.configuration.PluginSetting;
 import com.amazon.situp.model.record.Record;
-import com.amazon.situp.model.PluginType;
 import com.amazon.situp.model.sink.Sink;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
@@ -24,14 +24,14 @@
 
 import javax.ws.rs.HttpMethod;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import static com.amazon.situp.plugins.sink.elasticsearch.ConnectionConfiguration.CONNECT_TIMEOUT;
 import static com.amazon.situp.plugins.sink.elasticsearch.ConnectionConfiguration.HOSTS;
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkConfiguration.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkConfiguration.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkConfiguration.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkConfiguration.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfiguration.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfiguration.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfiguration.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfiguration.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConstants.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConstants.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConstants.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConstants.java
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/RetryConfiguration.java b/situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/RetryConfiguration.java
similarity index 100%
rename from situp-plugins/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/RetryConfiguration.java
rename to situp-plugins/elasticsearch/src/main/java/com/amazon/situp/plugins/sink/elasticsearch/RetryConfiguration.java
diff --git a/situp-plugins/src/main/resources/otel-v1-apm-service-map-index-template.json b/situp-plugins/elasticsearch/src/main/resources/otel-v1-apm-service-map-index-template.json
similarity index 100%
rename from situp-plugins/src/main/resources/otel-v1-apm-service-map-index-template.json
rename to situp-plugins/elasticsearch/src/main/resources/otel-v1-apm-service-map-index-template.json
diff --git a/situp-plugins/src/main/resources/otel-v1-apm-span-index-template.json b/situp-plugins/elasticsearch/src/main/resources/otel-v1-apm-span-index-template.json
similarity index 100%
rename from situp-plugins/src/main/resources/otel-v1-apm-span-index-template.json
rename to situp-plugins/elasticsearch/src/main/resources/otel-v1-apm-span-index-template.json
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionPipelineComponentIT.java b/situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionPipelineComponentIT.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionPipelineComponentIT.java
rename to situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ConnectionPipelineComponentIT.java
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java b/situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java
similarity index 99%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java
rename to situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java
index 616606152d..48e55fe1f9 100644
--- a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java
+++ b/situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/ElasticsearchSinkIT.java
@@ -13,7 +13,6 @@
 
 import javax.ws.rs.HttpMethod;
 import java.io.IOException;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfigurationTests.java b/situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfigurationTests.java
similarity index 100%
rename from situp-plugins/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfigurationTests.java
rename to situp-plugins/elasticsearch/src/test/java/com/amazon/situp/plugins/sink/elasticsearch/IndexConfigurationTests.java
diff --git a/situp-plugins/src/test/resources/test-index-template.json b/situp-plugins/elasticsearch/src/test/resources/test-index-template.json
similarity index 100%
rename from situp-plugins/src/test/resources/test-index-template.json
rename to situp-plugins/elasticsearch/src/test/resources/test-index-template.json
diff --git a/situp-plugins/src/.DS_Store b/situp-plugins/src/.DS_Store
deleted file mode 100644
index 6e082f68fc..0000000000
Binary files a/situp-plugins/src/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/.DS_Store b/situp-plugins/src/main/.DS_Store
deleted file mode 100644
index 39f576f3eb..0000000000
Binary files a/situp-plugins/src/main/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/.DS_Store b/situp-plugins/src/main/java/.DS_Store
deleted file mode 100644
index 5a84b3c69c..0000000000
Binary files a/situp-plugins/src/main/java/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/.DS_Store b/situp-plugins/src/main/java/com/.DS_Store
deleted file mode 100644
index 65c34a41bd..0000000000
Binary files a/situp-plugins/src/main/java/com/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/.DS_Store b/situp-plugins/src/main/java/com/amazon/.DS_Store
deleted file mode 100644
index df610a35aa..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/.DS_Store
deleted file mode 100644
index ec7af43360..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/plugins/.DS_Store
deleted file mode 100644
index f86ea11f88..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/plugins/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/.DS_Store
deleted file mode 100644
index 55d79fd3ba..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/plugins/sink/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/plugins/source/.DS_Store
deleted file mode 100644
index b7cc5a9275..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/.DS_Store
deleted file mode 100644
index 1a1d504711..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/.DS_Store b/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/.DS_Store
deleted file mode 100644
index 95022c21b7..0000000000
Binary files a/situp-plugins/src/main/java/com/amazon/situp/plugins/source/apmtracesource/http/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/main/resources/.DS_Store b/situp-plugins/src/main/resources/.DS_Store
deleted file mode 100644
index e0c9014361..0000000000
Binary files a/situp-plugins/src/main/resources/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/resources/file-test-sample-output.txt b/situp-plugins/src/resources/file-test-sample-output.txt
deleted file mode 100644
index d6858c95e2..0000000000
--- a/situp-plugins/src/resources/file-test-sample-output.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-THIS IS A SAMPLE TEXT
-THIS TEXT WILL BE PROCESSED
-IF PROCESSED BY STRING PROCESSOR
-IT WILL BE SHIFTED TO UPPER CASE
diff --git a/situp-plugins/src/resources/file-test-sample.txt b/situp-plugins/src/resources/file-test-sample.txt
deleted file mode 100644
index 3218282ec8..0000000000
--- a/situp-plugins/src/resources/file-test-sample.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-this is a sample text
-this text will be processed
-if processed by string processor
-it will be shifted to upper case
\ No newline at end of file
diff --git a/situp-plugins/src/resources/otel-v1-apm-service-map-index-template.json b/situp-plugins/src/resources/otel-v1-apm-service-map-index-template.json
deleted file mode 100644
index 49bee698cd..0000000000
--- a/situp-plugins/src/resources/otel-v1-apm-service-map-index-template.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "settings": {
-    "number_of_shards": 1,
-    "number_of_replicas": 2
-  },
-  "mappings": {
-    "date_detection": false,
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
-      }
-    ],
-    "_source": {
-      "enabled": true
-    },
-    "properties": {
-      "source": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "destination": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/situp-plugins/src/resources/otel-v1-apm-span-index-template.json b/situp-plugins/src/resources/otel-v1-apm-span-index-template.json
deleted file mode 100644
index 8ff7f36a42..0000000000
--- a/situp-plugins/src/resources/otel-v1-apm-span-index-template.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "settings": {
-    "number_of_shards": 1,
-    "number_of_replicas": 2
-  },
-  "mappings": {
-    "date_detection": false,
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
-      }
-    ],
-    "_source": {
-      "enabled": true
-    },
-    "properties": {
-      "traceId": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "spanId": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "name": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "kind": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "startTime": {
-        "type": "date_nanos"
-      },
-      "endTime": {
-        "type": "date_nanos"
-      },
-      "resource.attributes.service.name": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/situp-plugins/src/test/.DS_Store b/situp-plugins/src/test/.DS_Store
deleted file mode 100644
index 39f576f3eb..0000000000
Binary files a/situp-plugins/src/test/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/.DS_Store b/situp-plugins/src/test/java/.DS_Store
deleted file mode 100644
index 5a84b3c69c..0000000000
Binary files a/situp-plugins/src/test/java/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/com/.DS_Store b/situp-plugins/src/test/java/com/.DS_Store
deleted file mode 100644
index 65c34a41bd..0000000000
Binary files a/situp-plugins/src/test/java/com/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/com/amazon/.DS_Store b/situp-plugins/src/test/java/com/amazon/.DS_Store
deleted file mode 100644
index df610a35aa..0000000000
Binary files a/situp-plugins/src/test/java/com/amazon/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/com/amazon/situp/.DS_Store b/situp-plugins/src/test/java/com/amazon/situp/.DS_Store
deleted file mode 100644
index ec7af43360..0000000000
Binary files a/situp-plugins/src/test/java/com/amazon/situp/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/.DS_Store b/situp-plugins/src/test/java/com/amazon/situp/plugins/.DS_Store
deleted file mode 100644
index 66313569ad..0000000000
Binary files a/situp-plugins/src/test/java/com/amazon/situp/plugins/.DS_Store and /dev/null differ
diff --git a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/.DS_Store b/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/.DS_Store
deleted file mode 100644
index 9e88cc3a2a..0000000000
Binary files a/situp-plugins/src/test/java/com/amazon/situp/plugins/sink/.DS_Store and /dev/null differ