diff --git a/api/pom.xml b/api/pom.xml
deleted file mode 100644
index c603c0e3984d..000000000000
--- a/api/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>druid-api</artifactId>
-    <name>druid-api</name>
-    <description>Druid Extensions API</description>
-
-    <parent>
-        <groupId>org.apache.druid</groupId>
-        <artifactId>druid</artifactId>
-        <version>0.13.0-incubating-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
-            <version>${project.parent.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>airline</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.thisptr</groupId>
-            <artifactId>jackson-jq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-        </dependency>
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jul</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/aws-common/pom.xml b/aws-common/pom.xml
index a8e2c88dc172..fd1e874f1caa 100644
--- a/aws-common/pom.xml
+++ b/aws-common/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
diff --git a/common/pom.xml b/common/pom.xml
deleted file mode 100644
index 8feb760bb894..000000000000
--- a/common/pom.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>druid-common</artifactId>
-    <name>druid-common</name>
-    <description>druid-common</description>
-
-    <parent>
-        <groupId>org.apache.druid</groupId>
-        <artifactId>druid</artifactId>
-        <version>0.13.0-incubating-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
-            <version>${project.parent.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-            <version>1.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skife.config</groupId>
-            <artifactId>config-magic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jdbi</groupId>
-            <artifactId>jdbi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jul</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
-        <!-- com.lmax.disruptor is optional in log4j-core, so we explicitly include it here -->
-        <dependency>
-            <groupId>com.lmax</groupId>
-            <artifactId>disruptor</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-        </dependency>
-
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>strict</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <compilerArgs>
-                                <!-- Antlr-generated classes miss @Override, that is not easy to fix -->
-                                <arg>-Xep:MissingOverride:WARN</arg>
-                            </compilerArgs>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 000000000000..48bb5f301c0b
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <name>druid-core</name>
+  <artifactId>druid-core</artifactId>
+  <description>Core druid module</description>
+
+  <parent>
+    <artifactId>druid</artifactId>
+    <groupId>org.apache.druid</groupId>
+    <version>0.13.0-incubating-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <sigar.base.version>1.6.5</sigar.base.version>
+    <sigar.version>${sigar.base.version}.132</sigar.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.skife.config</groupId>
+      <artifactId>config-magic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>javax.el-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-smile</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-multibindings</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jdbi</groupId>
+      <artifactId>jdbi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jul</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.airlift</groupId>
+      <artifactId>airline</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.thisptr</groupId>
+      <artifactId>jackson-jq</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>it.unimi.dsi</groupId>
+      <artifactId>fastutil</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.tukaani</groupId>
+      <artifactId>xz</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.github.luben</groupId>
+      <artifactId>zstd-jni</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.jayway.jsonpath</groupId>
+      <artifactId>json-path</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+    </dependency>
+
+
+
+    <!-- com.lmax.disruptor is optional in log4j-core, so we explicitly include it here -->
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+    </dependency>
+
+
+    <!-- Extra dependencies for emitter -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.asynchttpclient</groupId>
+      <artifactId>async-http-client</artifactId>
+    </dependency>
+
+    <!-- Extra dependencies for server-metrics -->
+    <dependency>
+      <groupId>org.hyperic</groupId>
+      <artifactId>sigar</artifactId>
+      <version>${sigar.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hyperic</groupId>
+      <artifactId>sigar-dist</artifactId>
+      <version>${sigar.version}</version>
+      <type>zip</type>
+      <!-- "Provided" because this dependency is used only during the build itself: some files from this
+      dependency are copied as resources. See maven-dependency-plugin configuration and <resources> below. -->
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gridkit.lab</groupId>
+      <artifactId>jvm-attach-api</artifactId>
+    </dependency>
+
+    <!-- Extra dependency for http-client -->
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+
+
+    <!-- Tests -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>antlr4</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-sigar-lib-to-resources</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.hyperic</includeGroupIds>
+              <includeArtifactIds>sigar-dist</includeArtifactIds>
+              <includes>**/sigar-bin/lib/*</includes>
+              <excludes>**/sigar-bin/lib/*jar</excludes>
+              <outputDirectory>
+                ${project.build.directory}
+              </outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>java.library.path</name>
+              <value>${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib/</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+
+    <resources>
+      <resource>
+        <directory>
+          ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib
+        </directory>
+      </resource>
+    </resources>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>sigar</id>
+      <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>strict</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <compilerArgs>
+                <!-- Antlr-generated classes miss @Override, that is not easy to fix -->
+                <arg>-Xep:MissingOverride:WARN</arg>
+              </compilerArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/common/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 b/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
similarity index 100%
rename from common/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
rename to core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
diff --git a/common/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java b/core/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java
rename to core/src/main/java/org/apache/druid/annotations/EverythingIsNonnullByDefault.java
diff --git a/common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java b/core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java
rename to core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublic.java
diff --git a/common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java b/core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
rename to core/src/main/java/org/apache/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
diff --git a/common/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java b/core/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java
rename to core/src/main/java/org/apache/druid/annotations/UsedByJUnitParamsRunner.java
diff --git a/common/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java b/core/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java
rename to core/src/main/java/org/apache/druid/annotations/UsedInGeneratedCode.java
diff --git a/common/src/main/java/org/apache/druid/audit/AuditEntry.java b/core/src/main/java/org/apache/druid/audit/AuditEntry.java
similarity index 98%
rename from common/src/main/java/org/apache/druid/audit/AuditEntry.java
rename to core/src/main/java/org/apache/druid/audit/AuditEntry.java
index 12cbe96a96b3..2aeb77279953 100644
--- a/common/src/main/java/org/apache/druid/audit/AuditEntry.java
+++ b/core/src/main/java/org/apache/druid/audit/AuditEntry.java
@@ -91,9 +91,9 @@ public DateTime getAuditTime()
     return auditTime;
   }
 
-  public static AuditEntry.Builder builder()
+  public static Builder builder()
   {
-    return new AuditEntry.Builder();
+    return new Builder();
   }
 
   @Override
diff --git a/common/src/main/java/org/apache/druid/audit/AuditInfo.java b/core/src/main/java/org/apache/druid/audit/AuditInfo.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/audit/AuditInfo.java
rename to core/src/main/java/org/apache/druid/audit/AuditInfo.java
diff --git a/common/src/main/java/org/apache/druid/audit/AuditManager.java b/core/src/main/java/org/apache/druid/audit/AuditManager.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/audit/AuditManager.java
rename to core/src/main/java/org/apache/druid/audit/AuditManager.java
diff --git a/api/src/main/java/org/apache/druid/cli/CliCommandCreator.java b/core/src/main/java/org/apache/druid/cli/CliCommandCreator.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/cli/CliCommandCreator.java
rename to core/src/main/java/org/apache/druid/cli/CliCommandCreator.java
diff --git a/common/src/main/java/org/apache/druid/collections/BlockingPool.java b/core/src/main/java/org/apache/druid/collections/BlockingPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/BlockingPool.java
rename to core/src/main/java/org/apache/druid/collections/BlockingPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/CombiningIterable.java b/core/src/main/java/org/apache/druid/collections/CombiningIterable.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/CombiningIterable.java
rename to core/src/main/java/org/apache/druid/collections/CombiningIterable.java
diff --git a/common/src/main/java/org/apache/druid/collections/CombiningIterator.java b/core/src/main/java/org/apache/druid/collections/CombiningIterator.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/CombiningIterator.java
rename to core/src/main/java/org/apache/druid/collections/CombiningIterator.java
diff --git a/common/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java
rename to core/src/main/java/org/apache/druid/collections/DefaultBlockingPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/DummyBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DummyBlockingPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/DummyBlockingPool.java
rename to core/src/main/java/org/apache/druid/collections/DummyBlockingPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java b/core/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java
rename to core/src/main/java/org/apache/druid/collections/DummyNonBlockingPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/NonBlockingPool.java b/core/src/main/java/org/apache/druid/collections/NonBlockingPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/NonBlockingPool.java
rename to core/src/main/java/org/apache/druid/collections/NonBlockingPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java b/core/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java
rename to core/src/main/java/org/apache/druid/collections/OrderedMergeIterator.java
diff --git a/common/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java b/core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
rename to core/src/main/java/org/apache/druid/collections/OrderedMergeSequence.java
diff --git a/common/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java b/core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
rename to core/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
diff --git a/common/src/main/java/org/apache/druid/collections/Releaser.java b/core/src/main/java/org/apache/druid/collections/Releaser.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/Releaser.java
rename to core/src/main/java/org/apache/druid/collections/Releaser.java
diff --git a/common/src/main/java/org/apache/druid/collections/ResourceHolder.java b/core/src/main/java/org/apache/druid/collections/ResourceHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/ResourceHolder.java
rename to core/src/main/java/org/apache/druid/collections/ResourceHolder.java
diff --git a/common/src/main/java/org/apache/druid/collections/SerializablePair.java b/core/src/main/java/org/apache/druid/collections/SerializablePair.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/SerializablePair.java
rename to core/src/main/java/org/apache/druid/collections/SerializablePair.java
diff --git a/common/src/main/java/org/apache/druid/collections/StupidPool.java b/core/src/main/java/org/apache/druid/collections/StupidPool.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/StupidPool.java
rename to core/src/main/java/org/apache/druid/collections/StupidPool.java
diff --git a/common/src/main/java/org/apache/druid/collections/StupidResourceHolder.java b/core/src/main/java/org/apache/druid/collections/StupidResourceHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/collections/StupidResourceHolder.java
rename to core/src/main/java/org/apache/druid/collections/StupidResourceHolder.java
diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigManager.java b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java
similarity index 99%
rename from common/src/main/java/org/apache/druid/common/config/ConfigManager.java
rename to core/src/main/java/org/apache/druid/common/config/ConfigManager.java
index 1e88213262b0..f21742609b4c 100644
--- a/common/src/main/java/org/apache/druid/common/config/ConfigManager.java
+++ b/core/src/main/java/org/apache/druid/common/config/ConfigManager.java
@@ -56,7 +56,7 @@ public class ConfigManager
   private final ConcurrentMap<String, ConfigHolder> watchedConfigs;
   private final String configTable;
 
-  private volatile ConfigManager.PollingCallable poller;
+  private volatile PollingCallable poller;
 
   @Inject
   public ConfigManager(MetadataStorageConnector dbConnector, Supplier<MetadataStorageTablesConfig> dbTables, Supplier<ConfigManagerConfig> config)
diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java b/core/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java
rename to core/src/main/java/org/apache/druid/common/config/ConfigManagerConfig.java
diff --git a/common/src/main/java/org/apache/druid/common/config/ConfigSerde.java b/core/src/main/java/org/apache/druid/common/config/ConfigSerde.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/config/ConfigSerde.java
rename to core/src/main/java/org/apache/druid/common/config/ConfigSerde.java
diff --git a/common/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java b/core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
rename to core/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
diff --git a/common/src/main/java/org/apache/druid/common/config/Log4jShutdown.java b/core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
rename to core/src/main/java/org/apache/druid/common/config/Log4jShutdown.java
diff --git a/java-util/src/main/java/org/apache/druid/common/config/NullHandling.java b/core/src/main/java/org/apache/druid/common/config/NullHandling.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/common/config/NullHandling.java
rename to core/src/main/java/org/apache/druid/common/config/NullHandling.java
diff --git a/java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java b/core/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java
rename to core/src/main/java/org/apache/druid/common/config/NullValueHandlingConfig.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/CombiningSequence.java b/core/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
rename to core/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/DSuppliers.java b/core/src/main/java/org/apache/druid/common/guava/DSuppliers.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/DSuppliers.java
rename to core/src/main/java/org/apache/druid/common/guava/DSuppliers.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/GuavaUtils.java b/core/src/main/java/org/apache/druid/common/guava/GuavaUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/GuavaUtils.java
rename to core/src/main/java/org/apache/druid/common/guava/GuavaUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/SettableSupplier.java b/core/src/main/java/org/apache/druid/common/guava/SettableSupplier.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/SettableSupplier.java
rename to core/src/main/java/org/apache/druid/common/guava/SettableSupplier.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java b/core/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java
rename to core/src/main/java/org/apache/druid/common/guava/ThreadRenamingCallable.java
diff --git a/common/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java b/core/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
rename to core/src/main/java/org/apache/druid/common/guava/ThreadRenamingRunnable.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/ByteUtils.java b/core/src/main/java/org/apache/druid/common/utils/ByteUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/ByteUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/ByteUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java b/core/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/IntArrayUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/PropUtils.java b/core/src/main/java/org/apache/druid/common/utils/PropUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/PropUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/PropUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/SerializerUtils.java b/core/src/main/java/org/apache/druid/common/utils/SerializerUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/SerializerUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/SerializerUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java b/core/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/ServletResourceUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/SocketUtil.java b/core/src/main/java/org/apache/druid/common/utils/SocketUtil.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/SocketUtil.java
rename to core/src/main/java/org/apache/druid/common/utils/SocketUtil.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/UUIDUtils.java b/core/src/main/java/org/apache/druid/common/utils/UUIDUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/UUIDUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/UUIDUtils.java
diff --git a/common/src/main/java/org/apache/druid/common/utils/VMUtils.java b/core/src/main/java/org/apache/druid/common/utils/VMUtils.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/common/utils/VMUtils.java
rename to core/src/main/java/org/apache/druid/common/utils/VMUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java b/core/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java
rename to core/src/main/java/org/apache/druid/concurrent/ConcurrentAwaitableCounter.java
diff --git a/common/src/main/java/org/apache/druid/concurrent/LifecycleLock.java b/core/src/main/java/org/apache/druid/concurrent/LifecycleLock.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/concurrent/LifecycleLock.java
rename to core/src/main/java/org/apache/druid/concurrent/LifecycleLock.java
diff --git a/common/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java b/core/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java
rename to core/src/main/java/org/apache/druid/concurrent/TaskThreadPriority.java
diff --git a/common/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java b/core/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java
rename to core/src/main/java/org/apache/druid/data/SearchableVersionedDataFinder.java
diff --git a/api/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java
rename to core/src/main/java/org/apache/druid/data/input/ByteBufferInputRowParser.java
diff --git a/api/src/main/java/org/apache/druid/data/input/Committer.java b/core/src/main/java/org/apache/druid/data/input/Committer.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/Committer.java
rename to core/src/main/java/org/apache/druid/data/input/Committer.java
diff --git a/api/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java
rename to core/src/main/java/org/apache/druid/data/input/FiniteFirehoseFactory.java
diff --git a/api/src/main/java/org/apache/druid/data/input/Firehose.java b/core/src/main/java/org/apache/druid/data/input/Firehose.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/Firehose.java
rename to core/src/main/java/org/apache/druid/data/input/Firehose.java
diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/FirehoseFactory.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/FirehoseFactory.java
rename to core/src/main/java/org/apache/druid/data/input/FirehoseFactory.java
diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java b/core/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java
rename to core/src/main/java/org/apache/druid/data/input/FirehoseFactoryV2.java
diff --git a/api/src/main/java/org/apache/druid/data/input/FirehoseV2.java b/core/src/main/java/org/apache/druid/data/input/FirehoseV2.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/FirehoseV2.java
rename to core/src/main/java/org/apache/druid/data/input/FirehoseV2.java
diff --git a/api/src/main/java/org/apache/druid/data/input/InputRow.java b/core/src/main/java/org/apache/druid/data/input/InputRow.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/InputRow.java
rename to core/src/main/java/org/apache/druid/data/input/InputRow.java
diff --git a/api/src/main/java/org/apache/druid/data/input/InputSplit.java b/core/src/main/java/org/apache/druid/data/input/InputSplit.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/InputSplit.java
rename to core/src/main/java/org/apache/druid/data/input/InputSplit.java
diff --git a/api/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java b/core/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java
rename to core/src/main/java/org/apache/druid/data/input/MapBasedInputRow.java
diff --git a/api/src/main/java/org/apache/druid/data/input/MapBasedRow.java b/core/src/main/java/org/apache/druid/data/input/MapBasedRow.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/MapBasedRow.java
rename to core/src/main/java/org/apache/druid/data/input/MapBasedRow.java
diff --git a/api/src/main/java/org/apache/druid/data/input/Row.java b/core/src/main/java/org/apache/druid/data/input/Row.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/Row.java
rename to core/src/main/java/org/apache/druid/data/input/Row.java
diff --git a/api/src/main/java/org/apache/druid/data/input/Rows.java b/core/src/main/java/org/apache/druid/data/input/Rows.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/Rows.java
rename to core/src/main/java/org/apache/druid/data/input/Rows.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
rename to core/src/main/java/org/apache/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java b/core/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java
rename to core/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java
rename to core/src/main/java/org/apache/druid/data/input/impl/InputRowParser.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java
rename to core/src/main/java/org/apache/druid/data/input/impl/MapInputRowParser.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java
rename to core/src/main/java/org/apache/druid/data/input/impl/NoopInputRowParser.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/SpatialDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java b/core/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java
rename to core/src/main/java/org/apache/druid/data/input/impl/SqlFirehose.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java b/core/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
rename to core/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java b/core/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java
rename to core/src/main/java/org/apache/druid/data/input/impl/StringInputRowParser.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java b/core/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java
rename to core/src/main/java/org/apache/druid/data/input/impl/TimestampSpec.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/CacheManager.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/FetchedFile.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/Fetcher.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/FileFetcher.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/JsonIterator.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/ObjectOpenFunction.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/OpenedObject.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchConfig.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchSqlFirehoseFactory.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStream.java
diff --git a/api/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java b/core/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java
rename to core/src/main/java/org/apache/druid/data/input/impl/prefetch/SqlFetcher.java
diff --git a/api/src/main/java/org/apache/druid/guice/Binders.java b/core/src/main/java/org/apache/druid/guice/Binders.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/Binders.java
rename to core/src/main/java/org/apache/druid/guice/Binders.java
diff --git a/api/src/main/java/org/apache/druid/guice/ConditionalMultibind.java b/core/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
rename to core/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
diff --git a/common/src/main/java/org/apache/druid/guice/ConfigProvider.java b/core/src/main/java/org/apache/druid/guice/ConfigProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/ConfigProvider.java
rename to core/src/main/java/org/apache/druid/guice/ConfigProvider.java
diff --git a/api/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java b/core/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java
rename to core/src/main/java/org/apache/druid/guice/DruidGuiceExtensions.java
diff --git a/api/src/main/java/org/apache/druid/guice/DruidScopes.java b/core/src/main/java/org/apache/druid/guice/DruidScopes.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/DruidScopes.java
rename to core/src/main/java/org/apache/druid/guice/DruidScopes.java
diff --git a/common/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java b/core/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java
rename to core/src/main/java/org/apache/druid/guice/DruidSecondaryModule.java
diff --git a/common/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java b/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java
rename to core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java
diff --git a/common/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java b/core/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java
rename to core/src/main/java/org/apache/druid/guice/GuiceInjectableValues.java
diff --git a/common/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java b/core/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java
rename to core/src/main/java/org/apache/druid/guice/JacksonConfigManagerModule.java
diff --git a/common/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java b/core/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
rename to core/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
diff --git a/api/src/main/java/org/apache/druid/guice/Jerseys.java b/core/src/main/java/org/apache/druid/guice/Jerseys.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/Jerseys.java
rename to core/src/main/java/org/apache/druid/guice/Jerseys.java
diff --git a/api/src/main/java/org/apache/druid/guice/JsonConfigProvider.java b/core/src/main/java/org/apache/druid/guice/JsonConfigProvider.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/JsonConfigProvider.java
rename to core/src/main/java/org/apache/druid/guice/JsonConfigProvider.java
diff --git a/api/src/main/java/org/apache/druid/guice/JsonConfigurator.java b/core/src/main/java/org/apache/druid/guice/JsonConfigurator.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/JsonConfigurator.java
rename to core/src/main/java/org/apache/druid/guice/JsonConfigurator.java
diff --git a/api/src/main/java/org/apache/druid/guice/KeyHolder.java b/core/src/main/java/org/apache/druid/guice/KeyHolder.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/KeyHolder.java
rename to core/src/main/java/org/apache/druid/guice/KeyHolder.java
diff --git a/api/src/main/java/org/apache/druid/guice/LazySingleton.java b/core/src/main/java/org/apache/druid/guice/LazySingleton.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/LazySingleton.java
rename to core/src/main/java/org/apache/druid/guice/LazySingleton.java
diff --git a/api/src/main/java/org/apache/druid/guice/LifecycleModule.java b/core/src/main/java/org/apache/druid/guice/LifecycleModule.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/LifecycleModule.java
rename to core/src/main/java/org/apache/druid/guice/LifecycleModule.java
diff --git a/api/src/main/java/org/apache/druid/guice/LifecycleScope.java b/core/src/main/java/org/apache/druid/guice/LifecycleScope.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/LifecycleScope.java
rename to core/src/main/java/org/apache/druid/guice/LifecycleScope.java
diff --git a/common/src/main/java/org/apache/druid/guice/ListProvider.java b/core/src/main/java/org/apache/druid/guice/ListProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/guice/ListProvider.java
rename to core/src/main/java/org/apache/druid/guice/ListProvider.java
diff --git a/api/src/main/java/org/apache/druid/guice/ManageLifecycle.java b/core/src/main/java/org/apache/druid/guice/ManageLifecycle.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/ManageLifecycle.java
rename to core/src/main/java/org/apache/druid/guice/ManageLifecycle.java
diff --git a/api/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java b/core/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java
rename to core/src/main/java/org/apache/druid/guice/ManageLifecycleLast.java
diff --git a/api/src/main/java/org/apache/druid/guice/PolyBind.java b/core/src/main/java/org/apache/druid/guice/PolyBind.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/PolyBind.java
rename to core/src/main/java/org/apache/druid/guice/PolyBind.java
diff --git a/api/src/main/java/org/apache/druid/guice/SupplierProvider.java b/core/src/main/java/org/apache/druid/guice/SupplierProvider.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/SupplierProvider.java
rename to core/src/main/java/org/apache/druid/guice/SupplierProvider.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java b/core/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java
rename to core/src/main/java/org/apache/druid/guice/annotations/EscalatedGlobal.java
diff --git a/java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java b/core/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java
rename to core/src/main/java/org/apache/druid/guice/annotations/ExtensionPoint.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Global.java b/core/src/main/java/org/apache/druid/guice/annotations/Global.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/Global.java
rename to core/src/main/java/org/apache/druid/guice/annotations/Global.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java b/core/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java
rename to core/src/main/java/org/apache/druid/guice/annotations/JSR311Resource.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Json.java b/core/src/main/java/org/apache/druid/guice/annotations/Json.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/Json.java
rename to core/src/main/java/org/apache/druid/guice/annotations/Json.java
diff --git a/java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java b/core/src/main/java/org/apache/druid/guice/annotations/PublicApi.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/guice/annotations/PublicApi.java
rename to core/src/main/java/org/apache/druid/guice/annotations/PublicApi.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Self.java b/core/src/main/java/org/apache/druid/guice/annotations/Self.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/Self.java
rename to core/src/main/java/org/apache/druid/guice/annotations/Self.java
diff --git a/api/src/main/java/org/apache/druid/guice/annotations/Smile.java b/core/src/main/java/org/apache/druid/guice/annotations/Smile.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/guice/annotations/Smile.java
rename to core/src/main/java/org/apache/druid/guice/annotations/Smile.java
diff --git a/api/src/main/java/org/apache/druid/indexer/IngestionState.java b/core/src/main/java/org/apache/druid/indexer/IngestionState.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/IngestionState.java
rename to core/src/main/java/org/apache/druid/indexer/IngestionState.java
diff --git a/common/src/main/java/org/apache/druid/indexer/Jobby.java b/core/src/main/java/org/apache/druid/indexer/Jobby.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/indexer/Jobby.java
rename to core/src/main/java/org/apache/druid/indexer/Jobby.java
diff --git a/common/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java b/core/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java
rename to core/src/main/java/org/apache/druid/indexer/MetadataStorageUpdaterJobHandler.java
diff --git a/api/src/main/java/org/apache/druid/indexer/RunnerTaskState.java b/core/src/main/java/org/apache/druid/indexer/RunnerTaskState.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/RunnerTaskState.java
rename to core/src/main/java/org/apache/druid/indexer/RunnerTaskState.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskInfo.java b/core/src/main/java/org/apache/druid/indexer/TaskInfo.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskInfo.java
rename to core/src/main/java/org/apache/druid/indexer/TaskInfo.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskLocation.java b/core/src/main/java/org/apache/druid/indexer/TaskLocation.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskLocation.java
rename to core/src/main/java/org/apache/druid/indexer/TaskLocation.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java b/core/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java
rename to core/src/main/java/org/apache/druid/indexer/TaskMetricsGetter.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java b/core/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java
rename to core/src/main/java/org/apache/druid/indexer/TaskMetricsUtils.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskState.java b/core/src/main/java/org/apache/druid/indexer/TaskState.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskState.java
rename to core/src/main/java/org/apache/druid/indexer/TaskState.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskStatus.java b/core/src/main/java/org/apache/druid/indexer/TaskStatus.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskStatus.java
rename to core/src/main/java/org/apache/druid/indexer/TaskStatus.java
diff --git a/api/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java b/core/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java
rename to core/src/main/java/org/apache/druid/indexer/TaskStatusPlus.java
diff --git a/api/src/main/java/org/apache/druid/initialization/DruidModule.java b/core/src/main/java/org/apache/druid/initialization/DruidModule.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/initialization/DruidModule.java
rename to core/src/main/java/org/apache/druid/initialization/DruidModule.java
diff --git a/common/src/main/java/org/apache/druid/io/ByteBufferInputStream.java b/core/src/main/java/org/apache/druid/io/ByteBufferInputStream.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/io/ByteBufferInputStream.java
rename to core/src/main/java/org/apache/druid/io/ByteBufferInputStream.java
diff --git a/common/src/main/java/org/apache/druid/io/Channels.java b/core/src/main/java/org/apache/druid/io/Channels.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/io/Channels.java
rename to core/src/main/java/org/apache/druid/io/Channels.java
diff --git a/common/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java b/core/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java
rename to core/src/main/java/org/apache/druid/io/ZeroCopyByteArrayOutputStream.java
diff --git a/api/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java b/core/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java
rename to core/src/main/java/org/apache/druid/jackson/CommaListJoinDeserializer.java
diff --git a/api/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java b/core/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java
rename to core/src/main/java/org/apache/druid/jackson/CommaListJoinSerializer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java b/core/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java b/core/src/main/java/org/apache/druid/java/util/common/Cacheable.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/Cacheable.java
rename to core/src/main/java/org/apache/druid/java/util/common/Cacheable.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java b/core/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
rename to core/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java b/core/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/CompressionUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java b/core/src/main/java/org/apache/druid/java/util/common/DateTimes.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/DateTimes.java
rename to core/src/main/java/org/apache/druid/java/util/common/DateTimes.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java b/core/src/main/java/org/apache/druid/java/util/common/FileUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/FileUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/FileUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/IAE.java b/core/src/main/java/org/apache/druid/java/util/common/IAE.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/IAE.java
rename to core/src/main/java/org/apache/druid/java/util/common/IAE.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/IOE.java b/core/src/main/java/org/apache/druid/java/util/common/IOE.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/IOE.java
rename to core/src/main/java/org/apache/druid/java/util/common/IOE.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/ISE.java b/core/src/main/java/org/apache/druid/java/util/common/ISE.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/ISE.java
rename to core/src/main/java/org/apache/druid/java/util/common/ISE.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java b/core/src/main/java/org/apache/druid/java/util/common/Intervals.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/Intervals.java
rename to core/src/main/java/org/apache/druid/java/util/common/Intervals.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java b/core/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java b/core/src/main/java/org/apache/druid/java/util/common/MapUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/MapUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/MapUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java b/core/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java
rename to core/src/main/java/org/apache/druid/java/util/common/MappedByteBufferHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java b/core/src/main/java/org/apache/druid/java/util/common/Numbers.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/Numbers.java
rename to core/src/main/java/org/apache/druid/java/util/common/Numbers.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/Pair.java b/core/src/main/java/org/apache/druid/java/util/common/Pair.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/Pair.java
rename to core/src/main/java/org/apache/druid/java/util/common/Pair.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/RE.java b/core/src/main/java/org/apache/druid/java/util/common/RE.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/RE.java
rename to core/src/main/java/org/apache/druid/java/util/common/RE.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java b/core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/StreamUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/StringUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/UOE.java b/core/src/main/java/org/apache/druid/java/util/common/UOE.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/UOE.java
rename to core/src/main/java/org/apache/druid/java/util/common/UOE.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java b/core/src/main/java/org/apache/druid/java/util/common/collect/Utils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/collect/Utils.java
rename to core/src/main/java/org/apache/druid/java/util/common/collect/Utils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/DummyExecutorService.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/Execs.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServiceConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ExecutorServices.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ListenableFutures.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutorFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java b/core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
rename to core/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java b/core/src/main/java/org/apache/druid/java/util/common/config/Config.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/config/Config.java
rename to core/src/main/java/org/apache/druid/java/util/common/config/Config.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java b/core/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
rename to core/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/AllGranularity.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/DurationGranularity.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/NoneGranularity.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java b/core/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java
rename to core/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Accumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java b/core/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/CloseQuietly.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/DelegatingYieldingAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterable.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/DroppingIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/ExecuteWhenDoneYielder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteringAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/FilteringYieldingAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterable.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/FunctionalIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/LazySequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/LimitedSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappedSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappingAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MappingYieldingAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterable.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Sequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java b/core/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/SequenceWrapper.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Yielder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java b/core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java b/core/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/YieldingSequenceBase.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/BinaryFn.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryFn.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterable.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java b/core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/guava/nary/TrinaryTransformIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java b/core/src/main/java/org/apache/druid/java/util/common/io/Closer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/Closer.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/Closer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java b/core/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/NativeIO.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/FileSmoosher.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Metadata.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/Smoosh.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapper.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java b/core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java
rename to core/src/main/java/org/apache/druid/java/util/common/io/smoosh/SmooshedWriter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java b/core/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java
rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/Lifecycle.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java
rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStart.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java b/core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java
rename to core/src/main/java/org/apache/druid/java/util/common/lifecycle/LifecycleStop.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java b/core/src/main/java/org/apache/druid/java/util/common/logger/Logger.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/logger/Logger.java
rename to core/src/main/java/org/apache/druid/java/util/common/logger/Logger.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/AbstractFlatTextFormatParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/CSVParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldType.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathSpec.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlattener.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
similarity index 98%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
index 0c722932597c..2cdb2339f06d 100644
--- a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
+++ b/core/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
@@ -168,7 +168,7 @@ public Set<Entry<String, Object>> entrySet()
             return keySet().stream()
                            .map(
                                field -> {
-                                 return new Map.Entry<String, Object>()
+                                 return new Entry<String, Object>()
                                  {
                                    @Override
                                    public String getKey()
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ParseException.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/Parser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/Parsers.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java b/core/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java
rename to core/src/main/java/org/apache/druid/java/util/common/parsers/TimestampParser.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java b/core/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/EmittingLogger.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/BaseHttpEmittingConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Batch.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/BatchingStrategy.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ComposingEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ConcurrentTimeCounter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ContentEncoding.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Emitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Emitters.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/Event.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/Event.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/Event.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/FeedUriExtractor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/NoopEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ParametrizedUriExtractor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/UriExtractor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/core/ZeroCopyByteArrayOutputStream.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/EmitterFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/HttpEmitterFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/LoggingEmitterFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/NoopEmitterFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java b/core/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/factory/ParametrizedUriEmitterFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/service/AlertEvent.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEventBuilder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java
rename to core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/AbstractHttpClient.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/CredentialedHttpClient.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClient.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClientConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java b/core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/HttpClientInit.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java b/core/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/NettyHttpClient.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java b/core/src/main/java/org/apache/druid/java/util/http/client/Request.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/Request.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/Request.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java b/core/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/auth/BasicCredentials.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java b/core/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/auth/Credentials.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java b/core/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStream.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/netty/HttpClientPipelineFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ChannelResourceFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceContainer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourceFactory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java b/core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePoolConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/ClientResponse.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/FullResponseHolder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/HttpResponseHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/InputStreamResponseHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHandler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java b/core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java
rename to core/src/main/java/org/apache/druid/java/util/http/client/response/StatusResponseHolder.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java b/core/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/CgroupUtil.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/FeedDefiningMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/HttpPostEmitterMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmCpuMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmPidDiscoverer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java b/core/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/Monitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/Monitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/Monitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorScheduler.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorSchedulerConfig.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java b/core/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/MonitorUtils.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java b/core/src/main/java/org/apache/druid/java/util/metrics/Monitors.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/Monitors.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/Monitors.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/ParametrizedUriEmitterMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/PidDiscoverer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/SigarPidDiscoverer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java b/core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/SigarUtil.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java b/core/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CgroupDiscoverer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/CpuAcct.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/Memory.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscoverer.java
diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java b/core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java
similarity index 100%
rename from java-util/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java
rename to core/src/main/java/org/apache/druid/java/util/metrics/cgroups/ProcSelfCgroupDiscoverer.java
diff --git a/api/src/main/java/org/apache/druid/js/JavaScriptConfig.java b/core/src/main/java/org/apache/druid/js/JavaScriptConfig.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/js/JavaScriptConfig.java
rename to core/src/main/java/org/apache/druid/js/JavaScriptConfig.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/Evals.java b/core/src/main/java/org/apache/druid/math/expr/Evals.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/Evals.java
rename to core/src/main/java/org/apache/druid/math/expr/Evals.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/Expr.java b/core/src/main/java/org/apache/druid/math/expr/Expr.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/Expr.java
rename to core/src/main/java/org/apache/druid/math/expr/Expr.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprEval.java b/core/src/main/java/org/apache/druid/math/expr/ExprEval.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/ExprEval.java
rename to core/src/main/java/org/apache/druid/math/expr/ExprEval.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java b/core/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java
rename to core/src/main/java/org/apache/druid/math/expr/ExprListenerImpl.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java b/core/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
rename to core/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/ExprType.java b/core/src/main/java/org/apache/druid/math/expr/ExprType.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/ExprType.java
rename to core/src/main/java/org/apache/druid/math/expr/ExprType.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/Function.java b/core/src/main/java/org/apache/druid/math/expr/Function.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/Function.java
rename to core/src/main/java/org/apache/druid/math/expr/Function.java
diff --git a/common/src/main/java/org/apache/druid/math/expr/Parser.java b/core/src/main/java/org/apache/druid/math/expr/Parser.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/math/expr/Parser.java
rename to core/src/main/java/org/apache/druid/math/expr/Parser.java
diff --git a/common/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java
rename to core/src/main/java/org/apache/druid/metadata/DefaultPasswordProvider.java
diff --git a/common/src/main/java/org/apache/druid/metadata/EntryExistsException.java b/core/src/main/java/org/apache/druid/metadata/EntryExistsException.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/EntryExistsException.java
rename to core/src/main/java/org/apache/druid/metadata/EntryExistsException.java
diff --git a/common/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java
rename to core/src/main/java/org/apache/druid/metadata/EnvironmentVariablePasswordProvider.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java b/core/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataCASUpdate.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandler.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageConnector.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java
diff --git a/common/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java b/core/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java
rename to core/src/main/java/org/apache/druid/metadata/MetadataStorageTablesConfig.java
diff --git a/common/src/main/java/org/apache/druid/metadata/PasswordProvider.java b/core/src/main/java/org/apache/druid/metadata/PasswordProvider.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/metadata/PasswordProvider.java
rename to core/src/main/java/org/apache/druid/metadata/PasswordProvider.java
diff --git a/api/src/main/java/org/apache/druid/query/SegmentDescriptor.java b/core/src/main/java/org/apache/druid/query/SegmentDescriptor.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/query/SegmentDescriptor.java
rename to core/src/main/java/org/apache/druid/query/SegmentDescriptor.java
diff --git a/api/src/main/java/org/apache/druid/segment/SegmentUtils.java b/core/src/main/java/org/apache/druid/segment/SegmentUtils.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/SegmentUtils.java
rename to core/src/main/java/org/apache/druid/segment/SegmentUtils.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java
rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentArchiver.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java
rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentFinder.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java
rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentKiller.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java
rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentMover.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java b/core/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java
rename to core/src/main/java/org/apache/druid/segment/loading/DataSegmentPusher.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/LoadSpec.java b/core/src/main/java/org/apache/druid/segment/loading/LoadSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/LoadSpec.java
rename to core/src/main/java/org/apache/druid/segment/loading/LoadSpec.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java b/core/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java
rename to core/src/main/java/org/apache/druid/segment/loading/NoopDataSegmentPusher.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java b/core/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java
rename to core/src/main/java/org/apache/druid/segment/loading/SegmentLoadingException.java
diff --git a/api/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java b/core/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java
rename to core/src/main/java/org/apache/druid/segment/loading/URIDataPuller.java
diff --git a/api/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java b/core/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java
rename to core/src/main/java/org/apache/druid/tasklogs/NoopTaskLogs.java
diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java
rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogKiller.java
diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java
rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogPusher.java
diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java
rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogStreamer.java
diff --git a/api/src/main/java/org/apache/druid/tasklogs/TaskLogs.java b/core/src/main/java/org/apache/druid/tasklogs/TaskLogs.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/tasklogs/TaskLogs.java
rename to core/src/main/java/org/apache/druid/tasklogs/TaskLogs.java
diff --git a/api/src/main/java/org/apache/druid/timeline/DataSegment.java b/core/src/main/java/org/apache/druid/timeline/DataSegment.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/DataSegment.java
rename to core/src/main/java/org/apache/druid/timeline/DataSegment.java
diff --git a/api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
similarity index 98%
rename from api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
rename to core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
index 6edd2101289c..7966991a5310 100644
--- a/api/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
+++ b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
@@ -65,7 +65,7 @@ public Interval apply(String identifier)
    *
    * @param dataSource the dataSource corresponding to this identifier
    * @param identifier segment identifier
-   * @return a {@link DataSegmentUtils.SegmentIdentifierParts} object if the identifier could be parsed, null otherwise
+   * @return a {@link SegmentIdentifierParts} object if the identifier could be parsed, null otherwise
    */
   public static SegmentIdentifierParts valueOf(String dataSource, String identifier)
   {
diff --git a/common/src/main/java/org/apache/druid/timeline/LogicalSegment.java b/core/src/main/java/org/apache/druid/timeline/LogicalSegment.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/LogicalSegment.java
rename to core/src/main/java/org/apache/druid/timeline/LogicalSegment.java
diff --git a/api/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java b/core/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java
rename to core/src/main/java/org/apache/druid/timeline/PruneLoadSpec.java
diff --git a/common/src/main/java/org/apache/druid/timeline/TimelineLookup.java b/core/src/main/java/org/apache/druid/timeline/TimelineLookup.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/TimelineLookup.java
rename to core/src/main/java/org/apache/druid/timeline/TimelineLookup.java
diff --git a/common/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java b/core/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java
rename to core/src/main/java/org/apache/druid/timeline/TimelineObjectHolder.java
diff --git a/common/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java b/core/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java
rename to core/src/main/java/org/apache/druid/timeline/VersionedIntervalTimeline.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java b/core/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java
rename to core/src/main/java/org/apache/druid/timeline/partition/ImmutablePartitionHolder.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/LinearPartitionChunk.java
diff --git a/api/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java b/core/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java
rename to core/src/main/java/org/apache/druid/timeline/partition/NoneShardSpec.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
diff --git a/api/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/PartitionChunk.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java b/core/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java
rename to core/src/main/java/org/apache/druid/timeline/partition/PartitionHolder.java
diff --git a/api/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java b/core/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java
rename to core/src/main/java/org/apache/druid/timeline/partition/ShardSpec.java
diff --git a/api/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java b/core/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java
rename to core/src/main/java/org/apache/druid/timeline/partition/ShardSpecLookup.java
diff --git a/api/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/SingleElementPartitionChunk.java
diff --git a/common/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java b/core/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java
similarity index 100%
rename from common/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java
rename to core/src/main/java/org/apache/druid/timeline/partition/StringPartitionChunk.java
diff --git a/api/src/main/java/org/apache/druid/utils/CircularBuffer.java b/core/src/main/java/org/apache/druid/utils/CircularBuffer.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/utils/CircularBuffer.java
rename to core/src/main/java/org/apache/druid/utils/CircularBuffer.java
diff --git a/api/src/main/java/org/apache/druid/utils/CompressionUtils.java b/core/src/main/java/org/apache/druid/utils/CompressionUtils.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/utils/CompressionUtils.java
rename to core/src/main/java/org/apache/druid/utils/CompressionUtils.java
diff --git a/api/src/main/java/org/apache/druid/utils/Runnables.java b/core/src/main/java/org/apache/druid/utils/Runnables.java
similarity index 100%
rename from api/src/main/java/org/apache/druid/utils/Runnables.java
rename to core/src/main/java/org/apache/druid/utils/Runnables.java
diff --git a/common/src/main/resources/log4j2.debug.xml b/core/src/main/resources/log4j2.debug.xml
similarity index 100%
rename from common/src/main/resources/log4j2.debug.xml
rename to core/src/main/resources/log4j2.debug.xml
diff --git a/common/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml
similarity index 100%
rename from common/src/main/resources/log4j2.xml
rename to core/src/main/resources/log4j2.xml
diff --git a/common/src/main/resources/services/javax.annotation.processing.Processor b/core/src/main/resources/services/javax.annotation.processing.Processor
similarity index 100%
rename from common/src/main/resources/services/javax.annotation.processing.Processor
rename to core/src/main/resources/services/javax.annotation.processing.Processor
diff --git a/api/src/test/java/org/apache/druid/TestObjectMapper.java b/core/src/test/java/org/apache/druid/TestObjectMapper.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/TestObjectMapper.java
rename to core/src/test/java/org/apache/druid/TestObjectMapper.java
diff --git a/common/src/test/java/org/apache/druid/collections/BlockingPoolTest.java b/core/src/test/java/org/apache/druid/collections/BlockingPoolTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/BlockingPoolTest.java
rename to core/src/test/java/org/apache/druid/collections/BlockingPoolTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java b/core/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java
rename to core/src/test/java/org/apache/druid/collections/CloseableDefaultBlockingPool.java
diff --git a/common/src/test/java/org/apache/druid/collections/CloseableStupidPool.java b/core/src/test/java/org/apache/druid/collections/CloseableStupidPool.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/CloseableStupidPool.java
rename to core/src/test/java/org/apache/druid/collections/CloseableStupidPool.java
diff --git a/common/src/test/java/org/apache/druid/collections/CombiningIterableTest.java b/core/src/test/java/org/apache/druid/collections/CombiningIterableTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/CombiningIterableTest.java
rename to core/src/test/java/org/apache/druid/collections/CombiningIterableTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java b/core/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java
rename to core/src/test/java/org/apache/druid/collections/CombiningIteratorTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/IteratorShell.java b/core/src/test/java/org/apache/druid/collections/IteratorShell.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/IteratorShell.java
rename to core/src/test/java/org/apache/druid/collections/IteratorShell.java
diff --git a/common/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java b/core/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java
rename to core/src/test/java/org/apache/druid/collections/OrderedMergeIteratorTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java b/core/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java
rename to core/src/test/java/org/apache/druid/collections/OrderedMergeSequenceTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java b/core/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java
rename to core/src/test/java/org/apache/druid/collections/ReferenceCountingResourceHolderTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/SerializablePairTest.java b/core/src/test/java/org/apache/druid/collections/SerializablePairTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/SerializablePairTest.java
rename to core/src/test/java/org/apache/druid/collections/SerializablePairTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/StupidPoolTest.java b/core/src/test/java/org/apache/druid/collections/StupidPoolTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/StupidPoolTest.java
rename to core/src/test/java/org/apache/druid/collections/StupidPoolTest.java
diff --git a/common/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java b/core/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java
rename to core/src/test/java/org/apache/druid/collections/StupidResourceHolderTest.java
diff --git a/common/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java b/core/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
rename to core/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
diff --git a/common/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java b/core/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
rename to core/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
diff --git a/common/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java b/core/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/IntArrayUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/JodaUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/LogTest.java b/core/src/test/java/org/apache/druid/common/utils/LogTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/LogTest.java
rename to core/src/test/java/org/apache/druid/common/utils/LogTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/PropUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/ServletResourceUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java b/core/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java
rename to core/src/test/java/org/apache/druid/common/utils/SocketUtilTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/StringUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java b/core/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java
rename to core/src/test/java/org/apache/druid/common/utils/VMUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java b/core/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java
rename to core/src/test/java/org/apache/druid/concurrent/ConcurrentAwaitableCounterTest.java
diff --git a/common/src/test/java/org/apache/druid/concurrent/ExecsTest.java b/core/src/test/java/org/apache/druid/concurrent/ExecsTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/concurrent/ExecsTest.java
rename to core/src/test/java/org/apache/druid/concurrent/ExecsTest.java
diff --git a/common/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java b/core/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java
rename to core/src/test/java/org/apache/druid/concurrent/LifecycleLockTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java b/core/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java
rename to core/src/test/java/org/apache/druid/data/input/MapBasedRowTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/DimensionSchemaTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java b/core/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/DimensionsSpecSerdeTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java b/core/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/FileIteratingFirehoseTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java b/core/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/InputRowParserSerdeTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/JSONPathSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java b/core/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/NoopInputRowParserTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java b/core/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/SqlFirehoseTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java b/core/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/StringInputRowParserTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java b/core/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/TimestampSpecTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
diff --git a/api/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java b/core/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
rename to core/src/test/java/org/apache/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
diff --git a/api/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java b/core/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
rename to core/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
diff --git a/api/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java b/core/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java
rename to core/src/test/java/org/apache/druid/guice/JsonConfiguratorTest.java
diff --git a/common/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java b/core/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java
rename to core/src/test/java/org/apache/druid/guice/LifecycleScopeTest.java
diff --git a/api/src/test/java/org/apache/druid/guice/PolyBindTest.java b/core/src/test/java/org/apache/druid/guice/PolyBindTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/guice/PolyBindTest.java
rename to core/src/test/java/org/apache/druid/guice/PolyBindTest.java
diff --git a/api/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java b/core/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java
rename to core/src/test/java/org/apache/druid/indexer/TaskStatusPlusTest.java
diff --git a/api/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java b/core/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
rename to core/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java b/core/src/test/java/org/apache/druid/java/util/common/BufferUtils.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/BufferUtils.java
rename to core/src/test/java/org/apache/druid/java/util/common/BufferUtils.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/ByteBufferUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/CompressionUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/FileUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java b/core/src/test/java/org/apache/druid/java/util/common/GranularityTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/GranularityTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/GranularityTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java b/core/src/test/java/org/apache/druid/java/util/common/NumbersTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/NumbersTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/NumbersTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/StreamUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/StringUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/ComparatorsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/MergeIteratorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/MergeSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java b/core/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java b/core/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/TestSequence.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java b/core/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/UnsupportedSequence.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/WithEffectSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/WrappingSequenceTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java b/core/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/guava/nary/SortedMergeIteratorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java b/core/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/io/NativeIOTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java b/core/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/io/smoosh/SmooshedFileMapperTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java b/core/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/lifecycle/LifecycleTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java b/core/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/logger/LoggerTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/parsers/FlatTextFormatParserTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/parsers/JSONPathParserTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/parsers/JavaScriptParserTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/parsers/RegexParserTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java b/core/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java
rename to core/src/test/java/org/apache/druid/java/util/common/parsers/TimestampParserTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ComposingEmitterTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/CustomEmitterFactoryTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/EmitterTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandler.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterConfigTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpEmitterTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/IntEvent.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/LoggingEmitterConfigTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/MockHttpClient.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterConfigTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/core/ParametrizedUriEmitterTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/service/ServiceMetricEventTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java b/core/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java
rename to core/src/test/java/org/apache/druid/java/util/emitter/service/UnitEvent.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/AsyncHttpClientTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/FriendlyServersTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/JankyServersTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java b/core/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java
rename to core/src/test/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandlerTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/CgroupMemoryMonitorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/CpuAcctDeltaMonitorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/GcNameTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/JvmMonitorTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/JvmPidDiscovererTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/MonitorUtilsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/MonitorsTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/SigarLoadTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/SigarPidDiscovererTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java b/core/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/CpuAcctTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/MemoryTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/ProcCgroupDiscovererTest.java
diff --git a/java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java b/core/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java
similarity index 100%
rename from java-util/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java
rename to core/src/test/java/org/apache/druid/java/util/metrics/cgroups/TestUtils.java
diff --git a/api/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java b/core/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java
rename to core/src/test/java/org/apache/druid/js/JavaScriptConfigTest.java
diff --git a/common/src/test/java/org/apache/druid/math/expr/EvalTest.java b/core/src/test/java/org/apache/druid/math/expr/EvalTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/math/expr/EvalTest.java
rename to core/src/test/java/org/apache/druid/math/expr/EvalTest.java
diff --git a/common/src/test/java/org/apache/druid/math/expr/FunctionTest.java b/core/src/test/java/org/apache/druid/math/expr/FunctionTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/math/expr/FunctionTest.java
rename to core/src/test/java/org/apache/druid/math/expr/FunctionTest.java
diff --git a/common/src/test/java/org/apache/druid/math/expr/ParserTest.java b/core/src/test/java/org/apache/druid/math/expr/ParserTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/math/expr/ParserTest.java
rename to core/src/test/java/org/apache/druid/math/expr/ParserTest.java
diff --git a/common/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java b/core/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java
rename to core/src/test/java/org/apache/druid/metadata/DefaultPasswordProviderTest.java
diff --git a/common/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java b/core/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java
rename to core/src/test/java/org/apache/druid/metadata/EnvironmentVariablePasswordProviderTest.java
diff --git a/common/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java b/core/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java
rename to core/src/test/java/org/apache/druid/metadata/MetadataStorageConnectorConfigTest.java
diff --git a/api/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java b/core/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java
rename to core/src/test/java/org/apache/druid/segment/SegmentUtilsTest.java
diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java
rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentArchiver.java
diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java
rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentKiller.java
diff --git a/api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java b/core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java
rename to core/src/test/java/org/apache/druid/segment/loading/NoopDataSegmentMover.java
diff --git a/common/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java b/core/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java
rename to core/src/test/java/org/apache/druid/testing/DeadlockDetectingFailOnTimeout.java
diff --git a/common/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java b/core/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java
rename to core/src/test/java/org/apache/druid/testing/DeadlockDetectingTimeout.java
diff --git a/api/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
rename to core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
diff --git a/api/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java b/core/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java
rename to core/src/test/java/org/apache/druid/timeline/DataSegmentUtilsTest.java
diff --git a/common/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java b/core/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java
rename to core/src/test/java/org/apache/druid/timeline/VersionedIntervalTimelineTest.java
diff --git a/common/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java b/core/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java
rename to core/src/test/java/org/apache/druid/timeline/partition/IntegerPartitionChunkTest.java
diff --git a/api/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java b/core/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java
similarity index 100%
rename from api/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java
rename to core/src/test/java/org/apache/druid/timeline/partition/NoneShardSpecTest.java
diff --git a/common/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java b/core/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java
similarity index 100%
rename from common/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java
rename to core/src/test/java/org/apache/druid/timeline/partition/StringPartitionChunkTest.java
diff --git a/java-util/src/test/resources/cpuacct.usage_all b/core/src/test/resources/cpuacct.usage_all
similarity index 100%
rename from java-util/src/test/resources/cpuacct.usage_all
rename to core/src/test/resources/cpuacct.usage_all
diff --git a/java-util/src/test/resources/keystore.jks b/core/src/test/resources/keystore.jks
similarity index 100%
rename from java-util/src/test/resources/keystore.jks
rename to core/src/test/resources/keystore.jks
diff --git a/api/src/test/resources/log4j2.xml b/core/src/test/resources/log4j2.xml
similarity index 100%
rename from api/src/test/resources/log4j2.xml
rename to core/src/test/resources/log4j2.xml
diff --git a/java-util/src/test/resources/loremipsum.txt b/core/src/test/resources/loremipsum.txt
similarity index 100%
rename from java-util/src/test/resources/loremipsum.txt
rename to core/src/test/resources/loremipsum.txt
diff --git a/java-util/src/test/resources/memory.numa_stat b/core/src/test/resources/memory.numa_stat
similarity index 100%
rename from java-util/src/test/resources/memory.numa_stat
rename to core/src/test/resources/memory.numa_stat
diff --git a/java-util/src/test/resources/memory.stat b/core/src/test/resources/memory.stat
similarity index 100%
rename from java-util/src/test/resources/memory.stat
rename to core/src/test/resources/memory.stat
diff --git a/java-util/src/test/resources/proc.cgroups b/core/src/test/resources/proc.cgroups
similarity index 100%
rename from java-util/src/test/resources/proc.cgroups
rename to core/src/test/resources/proc.cgroups
diff --git a/java-util/src/test/resources/proc.mounts b/core/src/test/resources/proc.mounts
similarity index 100%
rename from java-util/src/test/resources/proc.mounts
rename to core/src/test/resources/proc.mounts
diff --git a/java-util/src/test/resources/proc.pid.cgroup b/core/src/test/resources/proc.pid.cgroup
similarity index 100%
rename from java-util/src/test/resources/proc.pid.cgroup
rename to core/src/test/resources/proc.pid.cgroup
diff --git a/docs/content/design/realtime.md b/docs/content/design/realtime.md
index 4088c6120f26..95ed0dcc7f28 100644
--- a/docs/content/design/realtime.md
+++ b/docs/content/design/realtime.md
@@ -42,7 +42,7 @@ Extending the code
 
 Realtime integration is intended to be extended in two ways:
 
-1.  Connect to data streams from varied systems ([Firehose](https://github.com/apache/incubator-druid-api/blob/master/src/main/java/org/apache/druid/data/input/FirehoseFactory.java))
+1.  Connect to data streams from varied systems ([Firehose](https://github.com/apache/incubator-druid/blob/master/core/src/main/org/apache/druid/data/input/FirehoseFactory.java))
 2.  Adjust the publishing strategy to match your needs ([Plumber](https://github.com/apache/incubator-druid/blob/master/server/src/main/java/org/apache/druid/segment/realtime/plumber/PlumberSchool.java))
 
 The expectations are that the former will be very common and something that users of Druid will do on a fairly regular basis. Most users will probably never have to deal with the latter form of customization. Indeed, we hope that all potential use cases can be packaged up as part of Druid proper without requiring proprietary customization.
diff --git a/docs/content/development/modules.md b/docs/content/development/modules.md
index e1a0d6c612e4..133e3b51b780 100644
--- a/docs/content/development/modules.md
+++ b/docs/content/development/modules.md
@@ -72,7 +72,7 @@ Binders.dataSegmentPusherBinder(binder)
        .to(HdfsDataSegmentPusher.class).in(LazySingleton.class);
 ```
 
-`Binders.dataSegment*Binder()` is a call provided by the druid-api jar which sets up a Guice multibind "MapBinder".  If that doesn't make sense, don't worry about it, just think of it as a magical incantation.
+`Binders.dataSegment*Binder()` is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder".  If that doesn't make sense, don't worry about it, just think of it as a magical incantation.
 
 `addBinding("hdfs")` for the Puller binder creates a new handler for loadSpec objects of type "hdfs".  For the Pusher binder it creates a new type value that you can specify for the `druid.storage.type` parameter.
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 404bb469bde4..94b362dd865f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extendedset/pom.xml b/extendedset/pom.xml
index 4a0c87de3927..2528d657ee0d 100755
--- a/extendedset/pom.xml
+++ b/extendedset/pom.xml
@@ -39,7 +39,7 @@
 
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 
diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml
index 6c4d5cc125fc..ead4738e1d6f 100644
--- a/extensions-contrib/ambari-metrics-emitter/pom.xml
+++ b/extensions-contrib/ambari-metrics-emitter/pom.xml
@@ -37,19 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/azure-extensions/pom.xml b/extensions-contrib/azure-extensions/pom.xml
index 6d30cddfcc66..685bc4cb9b52 100644
--- a/extensions-contrib/azure-extensions/pom.xml
+++ b/extensions-contrib/azure-extensions/pom.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml
index 46d0b0414176..4a3347904aca 100644
--- a/extensions-contrib/cassandra-storage/pom.xml
+++ b/extensions-contrib/cassandra-storage/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml
index 2be137282b25..307cd27ed791 100644
--- a/extensions-contrib/cloudfiles-extensions/pom.xml
+++ b/extensions-contrib/cloudfiles-extensions/pom.xml
@@ -45,7 +45,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml
index 16f18704f325..99b0aac8e984 100644
--- a/extensions-contrib/distinctcount/pom.xml
+++ b/extensions-contrib/distinctcount/pom.xml
@@ -45,7 +45,7 @@
         <!-- Tests -->
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
diff --git a/extensions-contrib/druid-rocketmq/pom.xml b/extensions-contrib/druid-rocketmq/pom.xml
index fa163a0029a9..bd22bab418e3 100644
--- a/extensions-contrib/druid-rocketmq/pom.xml
+++ b/extensions-contrib/druid-rocketmq/pom.xml
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/google-extensions/pom.xml b/extensions-contrib/google-extensions/pom.xml
index a0b4b1e159ef..508aa4880956 100644
--- a/extensions-contrib/google-extensions/pom.xml
+++ b/extensions-contrib/google-extensions/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml
index afc207ae8d53..5c268d768ad3 100644
--- a/extensions-contrib/graphite-emitter/pom.xml
+++ b/extensions-contrib/graphite-emitter/pom.xml
@@ -37,13 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -53,12 +47,6 @@
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-graphite</artifactId>
diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml
index 246bf6c3cdac..bb9d0fdaab56 100644
--- a/extensions-contrib/influx-extensions/pom.xml
+++ b/extensions-contrib/influx-extensions/pom.xml
@@ -43,7 +43,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml
index 4dbb20768ea3..a92d751b3fce 100644
--- a/extensions-contrib/kafka-eight-simpleConsumer/pom.xml
+++ b/extensions-contrib/kafka-eight-simpleConsumer/pom.xml
@@ -36,13 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml
index 6753a486623d..7c5e3e3f023f 100644
--- a/extensions-contrib/kafka-emitter/pom.xml
+++ b/extensions-contrib/kafka-emitter/pom.xml
@@ -42,19 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/opentsdb-emitter/pom.xml b/extensions-contrib/opentsdb-emitter/pom.xml
index d16cf841b871..ab368635f87c 100644
--- a/extensions-contrib/opentsdb-emitter/pom.xml
+++ b/extensions-contrib/opentsdb-emitter/pom.xml
@@ -38,7 +38,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/rabbitmq/pom.xml b/extensions-contrib/rabbitmq/pom.xml
index 9b5ab11ba56d..ee3aea32eebf 100644
--- a/extensions-contrib/rabbitmq/pom.xml
+++ b/extensions-contrib/rabbitmq/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/redis-cache/pom.xml b/extensions-contrib/redis-cache/pom.xml
index 7edc956d0ba6..cf8c8c74b311 100644
--- a/extensions-contrib/redis-cache/pom.xml
+++ b/extensions-contrib/redis-cache/pom.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/sqlserver-metadata-storage/pom.xml b/extensions-contrib/sqlserver-metadata-storage/pom.xml
index 2081f1d430ba..a3d0281adf6f 100644
--- a/extensions-contrib/sqlserver-metadata-storage/pom.xml
+++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml
@@ -36,13 +36,7 @@
 
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-contrib/statsd-emitter/pom.xml b/extensions-contrib/statsd-emitter/pom.xml
index 94bbc63c849f..d8c49abd8362 100644
--- a/extensions-contrib/statsd-emitter/pom.xml
+++ b/extensions-contrib/statsd-emitter/pom.xml
@@ -36,19 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-contrib/time-min-max/pom.xml b/extensions-contrib/time-min-max/pom.xml
index e3eacf5c8be6..9b7aa5e273e2 100644
--- a/extensions-contrib/time-min-max/pom.xml
+++ b/extensions-contrib/time-min-max/pom.xml
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -46,12 +46,6 @@
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -64,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml
index da8e79bcda8e..06ea0b412fa6 100644
--- a/extensions-contrib/virtual-columns/pom.xml
+++ b/extensions-contrib/virtual-columns/pom.xml
@@ -36,13 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-core/avro-extensions/pom.xml b/extensions-core/avro-extensions/pom.xml
index 127284761d70..35212b27f6ae 100644
--- a/extensions-core/avro-extensions/pom.xml
+++ b/extensions-core/avro-extensions/pom.xml
@@ -82,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml
index 32863dbd1fb6..1abb026ffe03 100644
--- a/extensions-core/datasketches/pom.xml
+++ b/extensions-core/datasketches/pom.xml
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -119,7 +119,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 3b134790534e..f08db35b5bae 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -36,22 +36,10 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.druid</groupId>
-          <artifactId>java-util</artifactId>
-          <version>${project.parent.version}</version>
-          <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
diff --git a/extensions-core/histogram/pom.xml b/extensions-core/histogram/pom.xml
index 61a7159b0a12..f30bb39d3614 100644
--- a/extensions-core/histogram/pom.xml
+++ b/extensions-core/histogram/pom.xml
@@ -49,7 +49,7 @@
         <!-- Tests -->
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
diff --git a/extensions-core/kafka-eight/pom.xml b/extensions-core/kafka-eight/pom.xml
index 6b7800162302..2ea7a80c648d 100644
--- a/extensions-core/kafka-eight/pom.xml
+++ b/extensions-core/kafka-eight/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml
index f69ba14d9cf4..24a06cafecb1 100644
--- a/extensions-core/kafka-extraction-namespace/pom.xml
+++ b/extensions-core/kafka-extraction-namespace/pom.xml
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml
index 1ba42f5c9dd7..ff22c8d737b8 100644
--- a/extensions-core/kafka-indexing-service/pom.xml
+++ b/extensions-core/kafka-indexing-service/pom.xml
@@ -40,7 +40,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/lookups-cached-global/pom.xml b/extensions-core/lookups-cached-global/pom.xml
index 7243c2863403..5a2b4be1680c 100644
--- a/extensions-core/lookups-cached-global/pom.xml
+++ b/extensions-core/lookups-cached-global/pom.xml
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/lookups-cached-single/pom.xml b/extensions-core/lookups-cached-single/pom.xml
index a99333fb7764..706a899010cf 100644
--- a/extensions-core/lookups-cached-single/pom.xml
+++ b/extensions-core/lookups-cached-single/pom.xml
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/mysql-metadata-storage/pom.xml b/extensions-core/mysql-metadata-storage/pom.xml
index 60bee90d99c1..2a8d5649b5df 100644
--- a/extensions-core/mysql-metadata-storage/pom.xml
+++ b/extensions-core/mysql-metadata-storage/pom.xml
@@ -37,13 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-core/postgresql-metadata-storage/pom.xml b/extensions-core/postgresql-metadata-storage/pom.xml
index b760ba8caff5..e828cfb3686c 100644
--- a/extensions-core/postgresql-metadata-storage/pom.xml
+++ b/extensions-core/postgresql-metadata-storage/pom.xml
@@ -37,13 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml
index 77df4e407b55..2f02db0c19e1 100644
--- a/extensions-core/protobuf-extensions/pom.xml
+++ b/extensions-core/protobuf-extensions/pom.xml
@@ -42,7 +42,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml
index d483de8f81be..c61874adaf2b 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -37,7 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -47,12 +47,6 @@
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/extensions-core/simple-client-sslcontext/pom.xml b/extensions-core/simple-client-sslcontext/pom.xml
index 49cfeb7042da..97d9c5b1d0a1 100644
--- a/extensions-core/simple-client-sslcontext/pom.xml
+++ b/extensions-core/simple-client-sslcontext/pom.xml
@@ -37,13 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-api</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -53,11 +47,5 @@
       <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.druid</groupId>
-      <artifactId>java-util</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/extensions-core/stats/pom.xml b/extensions-core/stats/pom.xml
index caa299402433..ea5c591cd510 100644
--- a/extensions-core/stats/pom.xml
+++ b/extensions-core/stats/pom.xml
@@ -48,7 +48,7 @@
         <!-- Tests -->
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
diff --git a/hll/pom.xml b/hll/pom.xml
index 0641ad912271..1fe71b1604d5 100644
--- a/hll/pom.xml
+++ b/hll/pom.xml
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index a213e800792b..6af9139791cd 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
                 <exclusions>
                     <exclusion>
diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml
index 6d6dd5bfff09..4aec189a636e 100644
--- a/indexing-service/pom.xml
+++ b/indexing-service/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -90,13 +90,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4790c7733b8b..73390ab537f1 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
diff --git a/java-util/src/test/resources/log4j2.xml b/integration-tests/src/main/resources/log4j2.xml
similarity index 97%
rename from java-util/src/test/resources/log4j2.xml
rename to integration-tests/src/main/resources/log4j2.xml
index e4477cf17a9e..dbce142e7f60 100644
--- a/java-util/src/test/resources/log4j2.xml
+++ b/integration-tests/src/main/resources/log4j2.xml
@@ -25,7 +25,7 @@
     </Console>
   </Appenders>
   <Loggers>
-    <Root level="debug">
+    <Root level="info">
       <AppenderRef ref="Console"/>
     </Root>
   </Loggers>
diff --git a/java-util/pom.xml b/java-util/pom.xml
deleted file mode 100644
index eae7b5a5f8b8..000000000000
--- a/java-util/pom.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.druid</groupId>
-        <artifactId>druid</artifactId>
-        <version>0.13.0-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>java-util</artifactId>
-    <name>java-util</name>
-    <description>java-util</description>
-
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sigar.base.version>1.6.5</sigar.base.version>
-        <sigar.version>${sigar.base.version}.132</sigar.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.skife.config</groupId>
-            <artifactId>config-magic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.opencsv</groupId>
-            <artifactId>opencsv</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.tukaani</groupId>
-            <artifactId>xz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.luben</groupId>
-            <artifactId>zstd-jni</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.thisptr</groupId>
-            <artifactId>jackson-jq</artifactId>
-        </dependency>
-
-        <!-- Extra dependencies for emitter -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-        </dependency>
-
-        <!-- Extra dependencies for server-metrics -->
-        <dependency>
-            <groupId>org.hyperic</groupId>
-            <artifactId>sigar</artifactId>
-            <version>${sigar.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hyperic</groupId>
-            <artifactId>sigar-dist</artifactId>
-            <version>${sigar.version}</version>
-            <type>zip</type>
-            <!-- "Provided" because this dependency is used only during the build itself: some files from this
-            dependency are copied as resources. See maven-dependency-plugin configuration and <resources> below. -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gridkit.lab</groupId>
-            <artifactId>jvm-attach-api</artifactId>
-        </dependency>
-
-        <!-- Extra dependency for http-client -->
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-        </dependency>
-
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jul</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>antlr4</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-sigar-lib-to-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.hyperic</includeGroupIds>
-                            <includeArtifactIds>sigar-dist</includeArtifactIds>
-                            <includes>**/sigar-bin/lib/*</includes>
-                            <excludes>**/sigar-bin/lib/*jar</excludes>
-                            <outputDirectory>
-                                ${project.build.directory}
-                            </outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>java.library.path</name>
-                            <value>${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib/</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>
-                    ${project.build.directory}/hyperic-sigar-${sigar.base.version}/sigar-bin/lib
-                </directory>
-            </resource>
-        </resources>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>sigar</id>
-            <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/pom.xml b/pom.xml
index fcc6f7155de3..a635d2ec2fab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,7 @@
     </properties>
 
     <modules>
-        <module>api</module>
-        <module>common</module>
+        <module>core</module>
         <module>examples</module>
         <module>indexing-hadoop</module>
         <module>indexing-service</module>
@@ -109,7 +108,6 @@
         <module>integration-tests</module>
         <module>benchmarks</module>
         <module>aws-common</module>
-        <module>java-util</module>
         <module>extendedset</module>
         <module>hll</module>
         <!-- Core extensions -->
diff --git a/processing/pom.xml b/processing/pom.xml
index 97b56e077e07..4963e32acbe8 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -34,14 +34,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.apache.druid</groupId>
-          <artifactId>java-util</artifactId>
-          <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
             <artifactId>druid-hll</artifactId>
@@ -120,7 +115,7 @@
         <!-- Tests -->
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -172,7 +167,7 @@
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.apache.druid</groupId>
-                            <artifactId>druid-common</artifactId>
+                            <artifactId>druid-core</artifactId>
                             <version>${project.parent.version}</version>
                         </path>
                     </annotationProcessorPaths>
diff --git a/server/pom.xml b/server/pom.xml
index e81199e4f2d3..501d336893cd 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>java-util</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
@@ -203,7 +203,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/services/pom.xml b/services/pom.xml
index db221a9f3ec9..8a18dcb311df 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -31,11 +31,11 @@
     </parent>
 
     <dependencies>
-        <!-- include druid-common to prevent older versions of dependencies
+        <!-- include druid-core to prevent older versions of dependencies
         from being pulled in by airline and dependencies of druid-server -->
         <dependency>
             <groupId>org.apache.druid</groupId>
-            <artifactId>druid-common</artifactId>
+            <artifactId>druid-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
diff --git a/sql/pom.xml b/sql/pom.xml
index ecac5d4564a5..162eb23f2414 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -90,7 +90,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
-      <artifactId>druid-common</artifactId>
+      <artifactId>druid-core</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>