diff --git a/docs/content/design/realtime.md b/docs/content/design/realtime.md
index d2cb39c3f531..97713944ac97 100644
--- a/docs/content/design/realtime.md
+++ b/docs/content/design/realtime.md
@@ -38,7 +38,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/druid-io/druid-api/blob/master/src/main/java/io/druid/data/input/FirehoseFactory.java))
+1.  Connect to data streams from varied systems ([Firehose](https://github.com/druid-io/druid/blob/master/java-util/src/main/java/io/druid/data/input/FirehoseFactory.java))
 2.  Adjust the publishing strategy to match your needs ([Plumber](https://github.com/druid-io/druid/blob/master/server/src/main/java/io/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 db529f3029a3..e47546eb0454 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 java-util 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/java-util/pom.xml b/java-util/pom.xml
index 7f0b462d9c57..a6be1e5aaf48 100644
--- a/java-util/pom.xml
+++ b/java-util/pom.xml
@@ -45,6 +45,107 @@
     </properties>
 
     <dependencies>
+        <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>javax.el</groupId>
+            <artifactId>javax.el-api</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>org.jdbi</groupId>
+            <artifactId>jdbi</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>
+        <!-- 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>
+
+        <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>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>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -69,6 +170,10 @@
             <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>net.sf.opencsv</groupId>
             <artifactId>opencsv</artifactId>
@@ -105,18 +210,10 @@
         </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>
@@ -166,31 +263,6 @@
             <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>
@@ -202,14 +274,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</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>
@@ -277,6 +353,26 @@
         </resources>
     </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>
+
     <repositories>
         <repository>
             <id>sigar</id>
diff --git a/common/src/main/antlr4/io/druid/math/expr/antlr/Expr.g4 b/java-util/src/main/antlr4/io/druid/math/expr/antlr/Expr.g4
similarity index 100%
rename from common/src/main/antlr4/io/druid/math/expr/antlr/Expr.g4
rename to java-util/src/main/antlr4/io/druid/math/expr/antlr/Expr.g4
diff --git a/common/src/main/java/io/druid/annotations/EverythingIsNonnullByDefault.java b/java-util/src/main/java/io/druid/annotations/EverythingIsNonnullByDefault.java
similarity index 100%
rename from common/src/main/java/io/druid/annotations/EverythingIsNonnullByDefault.java
rename to java-util/src/main/java/io/druid/annotations/EverythingIsNonnullByDefault.java
diff --git a/common/src/main/java/io/druid/annotations/SubclassesMustBePublic.java b/java-util/src/main/java/io/druid/annotations/SubclassesMustBePublic.java
similarity index 100%
rename from common/src/main/java/io/druid/annotations/SubclassesMustBePublic.java
rename to java-util/src/main/java/io/druid/annotations/SubclassesMustBePublic.java
diff --git a/common/src/main/java/io/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java b/java-util/src/main/java/io/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
similarity index 100%
rename from common/src/main/java/io/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
rename to java-util/src/main/java/io/druid/annotations/SubclassesMustBePublicAnnotationProcessor.java
diff --git a/common/src/main/java/io/druid/annotations/UsedByJUnitParamsRunner.java b/java-util/src/main/java/io/druid/annotations/UsedByJUnitParamsRunner.java
similarity index 100%
rename from common/src/main/java/io/druid/annotations/UsedByJUnitParamsRunner.java
rename to java-util/src/main/java/io/druid/annotations/UsedByJUnitParamsRunner.java
diff --git a/common/src/main/java/io/druid/annotations/UsedInGeneratedCode.java b/java-util/src/main/java/io/druid/annotations/UsedInGeneratedCode.java
similarity index 100%
rename from common/src/main/java/io/druid/annotations/UsedInGeneratedCode.java
rename to java-util/src/main/java/io/druid/annotations/UsedInGeneratedCode.java
diff --git a/common/src/main/java/io/druid/audit/AuditEntry.java b/java-util/src/main/java/io/druid/audit/AuditEntry.java
similarity index 100%
rename from common/src/main/java/io/druid/audit/AuditEntry.java
rename to java-util/src/main/java/io/druid/audit/AuditEntry.java
diff --git a/common/src/main/java/io/druid/audit/AuditInfo.java b/java-util/src/main/java/io/druid/audit/AuditInfo.java
similarity index 100%
rename from common/src/main/java/io/druid/audit/AuditInfo.java
rename to java-util/src/main/java/io/druid/audit/AuditInfo.java
diff --git a/common/src/main/java/io/druid/audit/AuditManager.java b/java-util/src/main/java/io/druid/audit/AuditManager.java
similarity index 100%
rename from common/src/main/java/io/druid/audit/AuditManager.java
rename to java-util/src/main/java/io/druid/audit/AuditManager.java
diff --git a/api/src/main/java/io/druid/cli/CliCommandCreator.java b/java-util/src/main/java/io/druid/cli/CliCommandCreator.java
similarity index 100%
rename from api/src/main/java/io/druid/cli/CliCommandCreator.java
rename to java-util/src/main/java/io/druid/cli/CliCommandCreator.java
diff --git a/common/src/main/java/io/druid/collections/BlockingPool.java b/java-util/src/main/java/io/druid/collections/BlockingPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/BlockingPool.java
rename to java-util/src/main/java/io/druid/collections/BlockingPool.java
diff --git a/common/src/main/java/io/druid/collections/CombiningIterable.java b/java-util/src/main/java/io/druid/collections/CombiningIterable.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/CombiningIterable.java
rename to java-util/src/main/java/io/druid/collections/CombiningIterable.java
diff --git a/common/src/main/java/io/druid/collections/CombiningIterator.java b/java-util/src/main/java/io/druid/collections/CombiningIterator.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/CombiningIterator.java
rename to java-util/src/main/java/io/druid/collections/CombiningIterator.java
diff --git a/common/src/main/java/io/druid/collections/DefaultBlockingPool.java b/java-util/src/main/java/io/druid/collections/DefaultBlockingPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/DefaultBlockingPool.java
rename to java-util/src/main/java/io/druid/collections/DefaultBlockingPool.java
diff --git a/common/src/main/java/io/druid/collections/DummyBlockingPool.java b/java-util/src/main/java/io/druid/collections/DummyBlockingPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/DummyBlockingPool.java
rename to java-util/src/main/java/io/druid/collections/DummyBlockingPool.java
diff --git a/common/src/main/java/io/druid/collections/DummyNonBlockingPool.java b/java-util/src/main/java/io/druid/collections/DummyNonBlockingPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/DummyNonBlockingPool.java
rename to java-util/src/main/java/io/druid/collections/DummyNonBlockingPool.java
diff --git a/common/src/main/java/io/druid/collections/NonBlockingPool.java b/java-util/src/main/java/io/druid/collections/NonBlockingPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/NonBlockingPool.java
rename to java-util/src/main/java/io/druid/collections/NonBlockingPool.java
diff --git a/common/src/main/java/io/druid/collections/OrderedMergeIterator.java b/java-util/src/main/java/io/druid/collections/OrderedMergeIterator.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/OrderedMergeIterator.java
rename to java-util/src/main/java/io/druid/collections/OrderedMergeIterator.java
diff --git a/common/src/main/java/io/druid/collections/OrderedMergeSequence.java b/java-util/src/main/java/io/druid/collections/OrderedMergeSequence.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/OrderedMergeSequence.java
rename to java-util/src/main/java/io/druid/collections/OrderedMergeSequence.java
diff --git a/common/src/main/java/io/druid/collections/ReferenceCountingResourceHolder.java b/java-util/src/main/java/io/druid/collections/ReferenceCountingResourceHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/ReferenceCountingResourceHolder.java
rename to java-util/src/main/java/io/druid/collections/ReferenceCountingResourceHolder.java
diff --git a/common/src/main/java/io/druid/collections/Releaser.java b/java-util/src/main/java/io/druid/collections/Releaser.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/Releaser.java
rename to java-util/src/main/java/io/druid/collections/Releaser.java
diff --git a/common/src/main/java/io/druid/collections/ResourceHolder.java b/java-util/src/main/java/io/druid/collections/ResourceHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/ResourceHolder.java
rename to java-util/src/main/java/io/druid/collections/ResourceHolder.java
diff --git a/common/src/main/java/io/druid/collections/SerializablePair.java b/java-util/src/main/java/io/druid/collections/SerializablePair.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/SerializablePair.java
rename to java-util/src/main/java/io/druid/collections/SerializablePair.java
diff --git a/common/src/main/java/io/druid/collections/StupidPool.java b/java-util/src/main/java/io/druid/collections/StupidPool.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/StupidPool.java
rename to java-util/src/main/java/io/druid/collections/StupidPool.java
diff --git a/common/src/main/java/io/druid/collections/StupidResourceHolder.java b/java-util/src/main/java/io/druid/collections/StupidResourceHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/collections/StupidResourceHolder.java
rename to java-util/src/main/java/io/druid/collections/StupidResourceHolder.java
diff --git a/common/src/main/java/io/druid/common/config/ConfigManager.java b/java-util/src/main/java/io/druid/common/config/ConfigManager.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/ConfigManager.java
rename to java-util/src/main/java/io/druid/common/config/ConfigManager.java
diff --git a/common/src/main/java/io/druid/common/config/ConfigManagerConfig.java b/java-util/src/main/java/io/druid/common/config/ConfigManagerConfig.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/ConfigManagerConfig.java
rename to java-util/src/main/java/io/druid/common/config/ConfigManagerConfig.java
diff --git a/common/src/main/java/io/druid/common/config/ConfigSerde.java b/java-util/src/main/java/io/druid/common/config/ConfigSerde.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/ConfigSerde.java
rename to java-util/src/main/java/io/druid/common/config/ConfigSerde.java
diff --git a/common/src/main/java/io/druid/common/config/JacksonConfigManager.java b/java-util/src/main/java/io/druid/common/config/JacksonConfigManager.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/JacksonConfigManager.java
rename to java-util/src/main/java/io/druid/common/config/JacksonConfigManager.java
diff --git a/common/src/main/java/io/druid/common/config/Log4jShutdown.java b/java-util/src/main/java/io/druid/common/config/Log4jShutdown.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/Log4jShutdown.java
rename to java-util/src/main/java/io/druid/common/config/Log4jShutdown.java
diff --git a/common/src/main/java/io/druid/common/config/NullHandling.java b/java-util/src/main/java/io/druid/common/config/NullHandling.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/NullHandling.java
rename to java-util/src/main/java/io/druid/common/config/NullHandling.java
diff --git a/common/src/main/java/io/druid/common/config/NullValueHandlingConfig.java b/java-util/src/main/java/io/druid/common/config/NullValueHandlingConfig.java
similarity index 100%
rename from common/src/main/java/io/druid/common/config/NullValueHandlingConfig.java
rename to java-util/src/main/java/io/druid/common/config/NullValueHandlingConfig.java
diff --git a/common/src/main/java/io/druid/common/guava/CombiningSequence.java b/java-util/src/main/java/io/druid/common/guava/CombiningSequence.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/CombiningSequence.java
rename to java-util/src/main/java/io/druid/common/guava/CombiningSequence.java
diff --git a/common/src/main/java/io/druid/common/guava/DSuppliers.java b/java-util/src/main/java/io/druid/common/guava/DSuppliers.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/DSuppliers.java
rename to java-util/src/main/java/io/druid/common/guava/DSuppliers.java
diff --git a/common/src/main/java/io/druid/common/guava/GuavaUtils.java b/java-util/src/main/java/io/druid/common/guava/GuavaUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/GuavaUtils.java
rename to java-util/src/main/java/io/druid/common/guava/GuavaUtils.java
diff --git a/common/src/main/java/io/druid/common/guava/SettableSupplier.java b/java-util/src/main/java/io/druid/common/guava/SettableSupplier.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/SettableSupplier.java
rename to java-util/src/main/java/io/druid/common/guava/SettableSupplier.java
diff --git a/common/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java b/java-util/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
rename to java-util/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
diff --git a/common/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java b/java-util/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
similarity index 100%
rename from common/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
rename to java-util/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
diff --git a/common/src/main/java/io/druid/common/utils/ByteUtils.java b/java-util/src/main/java/io/druid/common/utils/ByteUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/ByteUtils.java
rename to java-util/src/main/java/io/druid/common/utils/ByteUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/IntArrayUtils.java b/java-util/src/main/java/io/druid/common/utils/IntArrayUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/IntArrayUtils.java
rename to java-util/src/main/java/io/druid/common/utils/IntArrayUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/PropUtils.java b/java-util/src/main/java/io/druid/common/utils/PropUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/PropUtils.java
rename to java-util/src/main/java/io/druid/common/utils/PropUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/SerializerUtils.java b/java-util/src/main/java/io/druid/common/utils/SerializerUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/SerializerUtils.java
rename to java-util/src/main/java/io/druid/common/utils/SerializerUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/ServletResourceUtils.java b/java-util/src/main/java/io/druid/common/utils/ServletResourceUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/ServletResourceUtils.java
rename to java-util/src/main/java/io/druid/common/utils/ServletResourceUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/SocketUtil.java b/java-util/src/main/java/io/druid/common/utils/SocketUtil.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/SocketUtil.java
rename to java-util/src/main/java/io/druid/common/utils/SocketUtil.java
diff --git a/common/src/main/java/io/druid/common/utils/UUIDUtils.java b/java-util/src/main/java/io/druid/common/utils/UUIDUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/UUIDUtils.java
rename to java-util/src/main/java/io/druid/common/utils/UUIDUtils.java
diff --git a/common/src/main/java/io/druid/common/utils/VMUtils.java b/java-util/src/main/java/io/druid/common/utils/VMUtils.java
similarity index 100%
rename from common/src/main/java/io/druid/common/utils/VMUtils.java
rename to java-util/src/main/java/io/druid/common/utils/VMUtils.java
diff --git a/common/src/main/java/io/druid/concurrent/LifecycleLock.java b/java-util/src/main/java/io/druid/concurrent/LifecycleLock.java
similarity index 100%
rename from common/src/main/java/io/druid/concurrent/LifecycleLock.java
rename to java-util/src/main/java/io/druid/concurrent/LifecycleLock.java
diff --git a/common/src/main/java/io/druid/concurrent/TaskThreadPriority.java b/java-util/src/main/java/io/druid/concurrent/TaskThreadPriority.java
similarity index 100%
rename from common/src/main/java/io/druid/concurrent/TaskThreadPriority.java
rename to java-util/src/main/java/io/druid/concurrent/TaskThreadPriority.java
diff --git a/common/src/main/java/io/druid/data/SearchableVersionedDataFinder.java b/java-util/src/main/java/io/druid/data/SearchableVersionedDataFinder.java
similarity index 100%
rename from common/src/main/java/io/druid/data/SearchableVersionedDataFinder.java
rename to java-util/src/main/java/io/druid/data/SearchableVersionedDataFinder.java
diff --git a/api/src/main/java/io/druid/data/input/ByteBufferInputRowParser.java b/java-util/src/main/java/io/druid/data/input/ByteBufferInputRowParser.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/ByteBufferInputRowParser.java
rename to java-util/src/main/java/io/druid/data/input/ByteBufferInputRowParser.java
diff --git a/api/src/main/java/io/druid/data/input/Committer.java b/java-util/src/main/java/io/druid/data/input/Committer.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/Committer.java
rename to java-util/src/main/java/io/druid/data/input/Committer.java
diff --git a/api/src/main/java/io/druid/data/input/Firehose.java b/java-util/src/main/java/io/druid/data/input/Firehose.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/Firehose.java
rename to java-util/src/main/java/io/druid/data/input/Firehose.java
diff --git a/api/src/main/java/io/druid/data/input/FirehoseFactory.java b/java-util/src/main/java/io/druid/data/input/FirehoseFactory.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/FirehoseFactory.java
rename to java-util/src/main/java/io/druid/data/input/FirehoseFactory.java
diff --git a/api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java b/java-util/src/main/java/io/druid/data/input/FirehoseFactoryV2.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java
rename to java-util/src/main/java/io/druid/data/input/FirehoseFactoryV2.java
diff --git a/api/src/main/java/io/druid/data/input/FirehoseV2.java b/java-util/src/main/java/io/druid/data/input/FirehoseV2.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/FirehoseV2.java
rename to java-util/src/main/java/io/druid/data/input/FirehoseV2.java
diff --git a/api/src/main/java/io/druid/data/input/InputRow.java b/java-util/src/main/java/io/druid/data/input/InputRow.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/InputRow.java
rename to java-util/src/main/java/io/druid/data/input/InputRow.java
diff --git a/api/src/main/java/io/druid/data/input/MapBasedInputRow.java b/java-util/src/main/java/io/druid/data/input/MapBasedInputRow.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/MapBasedInputRow.java
rename to java-util/src/main/java/io/druid/data/input/MapBasedInputRow.java
diff --git a/api/src/main/java/io/druid/data/input/MapBasedRow.java b/java-util/src/main/java/io/druid/data/input/MapBasedRow.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/MapBasedRow.java
rename to java-util/src/main/java/io/druid/data/input/MapBasedRow.java
diff --git a/api/src/main/java/io/druid/data/input/Row.java b/java-util/src/main/java/io/druid/data/input/Row.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/Row.java
rename to java-util/src/main/java/io/druid/data/input/Row.java
diff --git a/api/src/main/java/io/druid/data/input/Rows.java b/java-util/src/main/java/io/druid/data/input/Rows.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/Rows.java
rename to java-util/src/main/java/io/druid/data/input/Rows.java
diff --git a/api/src/main/java/io/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java b/java-util/src/main/java/io/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
rename to java-util/src/main/java/io/druid/data/input/impl/AbstractTextFilesFirehoseFactory.java
diff --git a/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/CSVParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/CSVParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/DimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/DimensionSchema.java
similarity index 96%
rename from api/src/main/java/io/druid/data/input/impl/DimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/DimensionSchema.java
index f2d9f9111860..f1cab89579f0 100644
--- a/api/src/main/java/io/druid/data/input/impl/DimensionSchema.java
+++ b/java-util/src/main/java/io/druid/data/input/impl/DimensionSchema.java
@@ -52,13 +52,9 @@ public abstract class DimensionSchema
   public static final String DOUBLE_TYPE_NAME = "double";
   private static final EmittingLogger log = new EmittingLogger(DimensionSchema.class);
 
-
-  // main druid and druid-api should really use the same ValueType enum.
-  // merge them when druid-api is merged back into the main repo
-
   /**
    * Should be the same as {@code io.druid.segment.column.ValueType}.
-   * TODO merge them when druid-api is merged back into the main repo
+   * TODO merge them when java-util is merged with druid-processing into a single druid-core module.
    */
   public enum ValueType
   {
diff --git a/api/src/main/java/io/druid/data/input/impl/DimensionsSpec.java b/java-util/src/main/java/io/druid/data/input/impl/DimensionsSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/DimensionsSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/DimensionsSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/DoubleDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/DoubleDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/DoubleDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/DoubleDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/FileIteratingFirehose.java b/java-util/src/main/java/io/druid/data/input/impl/FileIteratingFirehose.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/FileIteratingFirehose.java
rename to java-util/src/main/java/io/druid/data/input/impl/FileIteratingFirehose.java
diff --git a/api/src/main/java/io/druid/data/input/impl/FloatDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/FloatDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/FloatDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/FloatDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/InputRowParser.java b/java-util/src/main/java/io/druid/data/input/impl/InputRowParser.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/InputRowParser.java
rename to java-util/src/main/java/io/druid/data/input/impl/InputRowParser.java
diff --git a/api/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/JSONParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/JSONParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/JSONParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/JSONParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/LongDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/LongDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/LongDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/LongDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/MapInputRowParser.java b/java-util/src/main/java/io/druid/data/input/impl/MapInputRowParser.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/MapInputRowParser.java
rename to java-util/src/main/java/io/druid/data/input/impl/MapInputRowParser.java
diff --git a/api/src/main/java/io/druid/data/input/impl/NewSpatialDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/NewSpatialDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/NewSpatialDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/NewSpatialDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/NoopInputRowParser.java b/java-util/src/main/java/io/druid/data/input/impl/NoopInputRowParser.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/NoopInputRowParser.java
rename to java-util/src/main/java/io/druid/data/input/impl/NoopInputRowParser.java
diff --git a/api/src/main/java/io/druid/data/input/impl/ParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/ParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/ParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/ParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/RegexParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/RegexParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/RegexParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/RegexParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/StringDimensionSchema.java b/java-util/src/main/java/io/druid/data/input/impl/StringDimensionSchema.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/StringDimensionSchema.java
rename to java-util/src/main/java/io/druid/data/input/impl/StringDimensionSchema.java
diff --git a/api/src/main/java/io/druid/data/input/impl/StringInputRowParser.java b/java-util/src/main/java/io/druid/data/input/impl/StringInputRowParser.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/StringInputRowParser.java
rename to java-util/src/main/java/io/druid/data/input/impl/StringInputRowParser.java
diff --git a/api/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java b/java-util/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/TimestampSpec.java b/java-util/src/main/java/io/druid/data/input/impl/TimestampSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/TimestampSpec.java
rename to java-util/src/main/java/io/druid/data/input/impl/TimestampSpec.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/CacheManager.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/CacheManager.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/CacheManager.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/CacheManager.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/FetchedFile.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/FetchedFile.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/FetchedFile.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/FetchedFile.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/Fetcher.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/Fetcher.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/Fetcher.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/Fetcher.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/ObjectOpenFunction.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/ObjectOpenFunction.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/ObjectOpenFunction.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/ObjectOpenFunction.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/OpenedObject.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/OpenedObject.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/OpenedObject.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/OpenedObject.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactory.java
diff --git a/api/src/main/java/io/druid/data/input/impl/prefetch/RetryingInputStream.java b/java-util/src/main/java/io/druid/data/input/impl/prefetch/RetryingInputStream.java
similarity index 100%
rename from api/src/main/java/io/druid/data/input/impl/prefetch/RetryingInputStream.java
rename to java-util/src/main/java/io/druid/data/input/impl/prefetch/RetryingInputStream.java
diff --git a/api/src/main/java/io/druid/guice/Binders.java b/java-util/src/main/java/io/druid/guice/Binders.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/Binders.java
rename to java-util/src/main/java/io/druid/guice/Binders.java
diff --git a/api/src/main/java/io/druid/guice/ConditionalMultibind.java b/java-util/src/main/java/io/druid/guice/ConditionalMultibind.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/ConditionalMultibind.java
rename to java-util/src/main/java/io/druid/guice/ConditionalMultibind.java
diff --git a/common/src/main/java/io/druid/guice/ConfigProvider.java b/java-util/src/main/java/io/druid/guice/ConfigProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/ConfigProvider.java
rename to java-util/src/main/java/io/druid/guice/ConfigProvider.java
diff --git a/api/src/main/java/io/druid/guice/DruidGuiceExtensions.java b/java-util/src/main/java/io/druid/guice/DruidGuiceExtensions.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/DruidGuiceExtensions.java
rename to java-util/src/main/java/io/druid/guice/DruidGuiceExtensions.java
diff --git a/api/src/main/java/io/druid/guice/DruidScopes.java b/java-util/src/main/java/io/druid/guice/DruidScopes.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/DruidScopes.java
rename to java-util/src/main/java/io/druid/guice/DruidScopes.java
diff --git a/common/src/main/java/io/druid/guice/DruidSecondaryModule.java b/java-util/src/main/java/io/druid/guice/DruidSecondaryModule.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/DruidSecondaryModule.java
rename to java-util/src/main/java/io/druid/guice/DruidSecondaryModule.java
diff --git a/common/src/main/java/io/druid/guice/GuiceAnnotationIntrospector.java b/java-util/src/main/java/io/druid/guice/GuiceAnnotationIntrospector.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/GuiceAnnotationIntrospector.java
rename to java-util/src/main/java/io/druid/guice/GuiceAnnotationIntrospector.java
diff --git a/common/src/main/java/io/druid/guice/GuiceInjectableValues.java b/java-util/src/main/java/io/druid/guice/GuiceInjectableValues.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/GuiceInjectableValues.java
rename to java-util/src/main/java/io/druid/guice/GuiceInjectableValues.java
diff --git a/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java b/java-util/src/main/java/io/druid/guice/JacksonConfigManagerModule.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java
rename to java-util/src/main/java/io/druid/guice/JacksonConfigManagerModule.java
diff --git a/common/src/main/java/io/druid/guice/JacksonConfigProvider.java b/java-util/src/main/java/io/druid/guice/JacksonConfigProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/JacksonConfigProvider.java
rename to java-util/src/main/java/io/druid/guice/JacksonConfigProvider.java
diff --git a/api/src/main/java/io/druid/guice/Jerseys.java b/java-util/src/main/java/io/druid/guice/Jerseys.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/Jerseys.java
rename to java-util/src/main/java/io/druid/guice/Jerseys.java
diff --git a/api/src/main/java/io/druid/guice/JsonConfigProvider.java b/java-util/src/main/java/io/druid/guice/JsonConfigProvider.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/JsonConfigProvider.java
rename to java-util/src/main/java/io/druid/guice/JsonConfigProvider.java
diff --git a/api/src/main/java/io/druid/guice/JsonConfigurator.java b/java-util/src/main/java/io/druid/guice/JsonConfigurator.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/JsonConfigurator.java
rename to java-util/src/main/java/io/druid/guice/JsonConfigurator.java
diff --git a/api/src/main/java/io/druid/guice/KeyHolder.java b/java-util/src/main/java/io/druid/guice/KeyHolder.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/KeyHolder.java
rename to java-util/src/main/java/io/druid/guice/KeyHolder.java
diff --git a/api/src/main/java/io/druid/guice/LazySingleton.java b/java-util/src/main/java/io/druid/guice/LazySingleton.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/LazySingleton.java
rename to java-util/src/main/java/io/druid/guice/LazySingleton.java
diff --git a/api/src/main/java/io/druid/guice/LifecycleModule.java b/java-util/src/main/java/io/druid/guice/LifecycleModule.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/LifecycleModule.java
rename to java-util/src/main/java/io/druid/guice/LifecycleModule.java
diff --git a/api/src/main/java/io/druid/guice/LifecycleScope.java b/java-util/src/main/java/io/druid/guice/LifecycleScope.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/LifecycleScope.java
rename to java-util/src/main/java/io/druid/guice/LifecycleScope.java
diff --git a/common/src/main/java/io/druid/guice/ListProvider.java b/java-util/src/main/java/io/druid/guice/ListProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/guice/ListProvider.java
rename to java-util/src/main/java/io/druid/guice/ListProvider.java
diff --git a/api/src/main/java/io/druid/guice/ManageLifecycle.java b/java-util/src/main/java/io/druid/guice/ManageLifecycle.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/ManageLifecycle.java
rename to java-util/src/main/java/io/druid/guice/ManageLifecycle.java
diff --git a/api/src/main/java/io/druid/guice/ManageLifecycleLast.java b/java-util/src/main/java/io/druid/guice/ManageLifecycleLast.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/ManageLifecycleLast.java
rename to java-util/src/main/java/io/druid/guice/ManageLifecycleLast.java
diff --git a/api/src/main/java/io/druid/guice/PolyBind.java b/java-util/src/main/java/io/druid/guice/PolyBind.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/PolyBind.java
rename to java-util/src/main/java/io/druid/guice/PolyBind.java
diff --git a/api/src/main/java/io/druid/guice/SupplierProvider.java b/java-util/src/main/java/io/druid/guice/SupplierProvider.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/SupplierProvider.java
rename to java-util/src/main/java/io/druid/guice/SupplierProvider.java
diff --git a/api/src/main/java/io/druid/guice/annotations/EscalatedGlobal.java b/java-util/src/main/java/io/druid/guice/annotations/EscalatedGlobal.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/EscalatedGlobal.java
rename to java-util/src/main/java/io/druid/guice/annotations/EscalatedGlobal.java
diff --git a/api/src/main/java/io/druid/guice/annotations/ExtensionPoint.java b/java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/ExtensionPoint.java
rename to java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java
diff --git a/api/src/main/java/io/druid/guice/annotations/Global.java b/java-util/src/main/java/io/druid/guice/annotations/Global.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/Global.java
rename to java-util/src/main/java/io/druid/guice/annotations/Global.java
diff --git a/api/src/main/java/io/druid/guice/annotations/JSR311Resource.java b/java-util/src/main/java/io/druid/guice/annotations/JSR311Resource.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/JSR311Resource.java
rename to java-util/src/main/java/io/druid/guice/annotations/JSR311Resource.java
diff --git a/api/src/main/java/io/druid/guice/annotations/Json.java b/java-util/src/main/java/io/druid/guice/annotations/Json.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/Json.java
rename to java-util/src/main/java/io/druid/guice/annotations/Json.java
diff --git a/api/src/main/java/io/druid/guice/annotations/PublicApi.java b/java-util/src/main/java/io/druid/guice/annotations/PublicApi.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/PublicApi.java
rename to java-util/src/main/java/io/druid/guice/annotations/PublicApi.java
diff --git a/api/src/main/java/io/druid/guice/annotations/Self.java b/java-util/src/main/java/io/druid/guice/annotations/Self.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/Self.java
rename to java-util/src/main/java/io/druid/guice/annotations/Self.java
diff --git a/api/src/main/java/io/druid/guice/annotations/Smile.java b/java-util/src/main/java/io/druid/guice/annotations/Smile.java
similarity index 100%
rename from api/src/main/java/io/druid/guice/annotations/Smile.java
rename to java-util/src/main/java/io/druid/guice/annotations/Smile.java
diff --git a/api/src/main/java/io/druid/indexer/IngestionState.java b/java-util/src/main/java/io/druid/indexer/IngestionState.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/IngestionState.java
rename to java-util/src/main/java/io/druid/indexer/IngestionState.java
diff --git a/common/src/main/java/io/druid/indexer/Jobby.java b/java-util/src/main/java/io/druid/indexer/Jobby.java
similarity index 100%
rename from common/src/main/java/io/druid/indexer/Jobby.java
rename to java-util/src/main/java/io/druid/indexer/Jobby.java
diff --git a/common/src/main/java/io/druid/indexer/MetadataStorageUpdaterJobHandler.java b/java-util/src/main/java/io/druid/indexer/MetadataStorageUpdaterJobHandler.java
similarity index 100%
rename from common/src/main/java/io/druid/indexer/MetadataStorageUpdaterJobHandler.java
rename to java-util/src/main/java/io/druid/indexer/MetadataStorageUpdaterJobHandler.java
diff --git a/api/src/main/java/io/druid/indexer/TaskLocation.java b/java-util/src/main/java/io/druid/indexer/TaskLocation.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/TaskLocation.java
rename to java-util/src/main/java/io/druid/indexer/TaskLocation.java
diff --git a/api/src/main/java/io/druid/indexer/TaskMetricsGetter.java b/java-util/src/main/java/io/druid/indexer/TaskMetricsGetter.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/TaskMetricsGetter.java
rename to java-util/src/main/java/io/druid/indexer/TaskMetricsGetter.java
diff --git a/api/src/main/java/io/druid/indexer/TaskMetricsUtils.java b/java-util/src/main/java/io/druid/indexer/TaskMetricsUtils.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/TaskMetricsUtils.java
rename to java-util/src/main/java/io/druid/indexer/TaskMetricsUtils.java
diff --git a/api/src/main/java/io/druid/indexer/TaskState.java b/java-util/src/main/java/io/druid/indexer/TaskState.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/TaskState.java
rename to java-util/src/main/java/io/druid/indexer/TaskState.java
diff --git a/api/src/main/java/io/druid/indexer/TaskStatusPlus.java b/java-util/src/main/java/io/druid/indexer/TaskStatusPlus.java
similarity index 100%
rename from api/src/main/java/io/druid/indexer/TaskStatusPlus.java
rename to java-util/src/main/java/io/druid/indexer/TaskStatusPlus.java
diff --git a/api/src/main/java/io/druid/initialization/DruidModule.java b/java-util/src/main/java/io/druid/initialization/DruidModule.java
similarity index 100%
rename from api/src/main/java/io/druid/initialization/DruidModule.java
rename to java-util/src/main/java/io/druid/initialization/DruidModule.java
diff --git a/common/src/main/java/io/druid/io/ByteBufferInputStream.java b/java-util/src/main/java/io/druid/io/ByteBufferInputStream.java
similarity index 100%
rename from common/src/main/java/io/druid/io/ByteBufferInputStream.java
rename to java-util/src/main/java/io/druid/io/ByteBufferInputStream.java
diff --git a/common/src/main/java/io/druid/io/Channels.java b/java-util/src/main/java/io/druid/io/Channels.java
similarity index 100%
rename from common/src/main/java/io/druid/io/Channels.java
rename to java-util/src/main/java/io/druid/io/Channels.java
diff --git a/common/src/main/java/io/druid/io/ZeroCopyByteArrayOutputStream.java b/java-util/src/main/java/io/druid/io/ZeroCopyByteArrayOutputStream.java
similarity index 100%
rename from common/src/main/java/io/druid/io/ZeroCopyByteArrayOutputStream.java
rename to java-util/src/main/java/io/druid/io/ZeroCopyByteArrayOutputStream.java
diff --git a/api/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java b/java-util/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
similarity index 100%
rename from api/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
rename to java-util/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
diff --git a/api/src/main/java/io/druid/jackson/CommaListJoinSerializer.java b/java-util/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
similarity index 100%
rename from api/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
rename to java-util/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
diff --git a/api/src/main/java/io/druid/js/JavaScriptConfig.java b/java-util/src/main/java/io/druid/js/JavaScriptConfig.java
similarity index 100%
rename from api/src/main/java/io/druid/js/JavaScriptConfig.java
rename to java-util/src/main/java/io/druid/js/JavaScriptConfig.java
diff --git a/common/src/main/java/io/druid/math/expr/Evals.java b/java-util/src/main/java/io/druid/math/expr/Evals.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/Evals.java
rename to java-util/src/main/java/io/druid/math/expr/Evals.java
diff --git a/common/src/main/java/io/druid/math/expr/Expr.java b/java-util/src/main/java/io/druid/math/expr/Expr.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/Expr.java
rename to java-util/src/main/java/io/druid/math/expr/Expr.java
diff --git a/common/src/main/java/io/druid/math/expr/ExprEval.java b/java-util/src/main/java/io/druid/math/expr/ExprEval.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/ExprEval.java
rename to java-util/src/main/java/io/druid/math/expr/ExprEval.java
diff --git a/common/src/main/java/io/druid/math/expr/ExprListenerImpl.java b/java-util/src/main/java/io/druid/math/expr/ExprListenerImpl.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/ExprListenerImpl.java
rename to java-util/src/main/java/io/druid/math/expr/ExprListenerImpl.java
diff --git a/common/src/main/java/io/druid/math/expr/ExprMacroTable.java b/java-util/src/main/java/io/druid/math/expr/ExprMacroTable.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/ExprMacroTable.java
rename to java-util/src/main/java/io/druid/math/expr/ExprMacroTable.java
diff --git a/common/src/main/java/io/druid/math/expr/ExprType.java b/java-util/src/main/java/io/druid/math/expr/ExprType.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/ExprType.java
rename to java-util/src/main/java/io/druid/math/expr/ExprType.java
diff --git a/common/src/main/java/io/druid/math/expr/Function.java b/java-util/src/main/java/io/druid/math/expr/Function.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/Function.java
rename to java-util/src/main/java/io/druid/math/expr/Function.java
diff --git a/common/src/main/java/io/druid/math/expr/Parser.java b/java-util/src/main/java/io/druid/math/expr/Parser.java
similarity index 100%
rename from common/src/main/java/io/druid/math/expr/Parser.java
rename to java-util/src/main/java/io/druid/math/expr/Parser.java
diff --git a/common/src/main/java/io/druid/metadata/DefaultPasswordProvider.java b/java-util/src/main/java/io/druid/metadata/DefaultPasswordProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/DefaultPasswordProvider.java
rename to java-util/src/main/java/io/druid/metadata/DefaultPasswordProvider.java
diff --git a/common/src/main/java/io/druid/metadata/EntryExistsException.java b/java-util/src/main/java/io/druid/metadata/EntryExistsException.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/EntryExistsException.java
rename to java-util/src/main/java/io/druid/metadata/EntryExistsException.java
diff --git a/common/src/main/java/io/druid/metadata/EnvironmentVariablePasswordProvider.java b/java-util/src/main/java/io/druid/metadata/EnvironmentVariablePasswordProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/EnvironmentVariablePasswordProvider.java
rename to java-util/src/main/java/io/druid/metadata/EnvironmentVariablePasswordProvider.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataCASUpdate.java b/java-util/src/main/java/io/druid/metadata/MetadataCASUpdate.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataCASUpdate.java
rename to java-util/src/main/java/io/druid/metadata/MetadataCASUpdate.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandler.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandler.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageActionHandler.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandler.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandlerFactory.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageActionHandlerTypes.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageConnector.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageConnector.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageConnector.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageConnector.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java b/java-util/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java
rename to java-util/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java
diff --git a/common/src/main/java/io/druid/metadata/PasswordProvider.java b/java-util/src/main/java/io/druid/metadata/PasswordProvider.java
similarity index 100%
rename from common/src/main/java/io/druid/metadata/PasswordProvider.java
rename to java-util/src/main/java/io/druid/metadata/PasswordProvider.java
diff --git a/api/src/main/java/io/druid/query/SegmentDescriptor.java b/java-util/src/main/java/io/druid/query/SegmentDescriptor.java
similarity index 100%
rename from api/src/main/java/io/druid/query/SegmentDescriptor.java
rename to java-util/src/main/java/io/druid/query/SegmentDescriptor.java
diff --git a/api/src/main/java/io/druid/segment/SegmentUtils.java b/java-util/src/main/java/io/druid/segment/SegmentUtils.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/SegmentUtils.java
rename to java-util/src/main/java/io/druid/segment/SegmentUtils.java
diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentArchiver.java b/java-util/src/main/java/io/druid/segment/loading/DataSegmentArchiver.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/DataSegmentArchiver.java
rename to java-util/src/main/java/io/druid/segment/loading/DataSegmentArchiver.java
diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentFinder.java b/java-util/src/main/java/io/druid/segment/loading/DataSegmentFinder.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/DataSegmentFinder.java
rename to java-util/src/main/java/io/druid/segment/loading/DataSegmentFinder.java
diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentKiller.java b/java-util/src/main/java/io/druid/segment/loading/DataSegmentKiller.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/DataSegmentKiller.java
rename to java-util/src/main/java/io/druid/segment/loading/DataSegmentKiller.java
diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentMover.java b/java-util/src/main/java/io/druid/segment/loading/DataSegmentMover.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/DataSegmentMover.java
rename to java-util/src/main/java/io/druid/segment/loading/DataSegmentMover.java
diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentPusher.java b/java-util/src/main/java/io/druid/segment/loading/DataSegmentPusher.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/DataSegmentPusher.java
rename to java-util/src/main/java/io/druid/segment/loading/DataSegmentPusher.java
diff --git a/api/src/main/java/io/druid/segment/loading/LoadSpec.java b/java-util/src/main/java/io/druid/segment/loading/LoadSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/LoadSpec.java
rename to java-util/src/main/java/io/druid/segment/loading/LoadSpec.java
diff --git a/api/src/main/java/io/druid/segment/loading/SegmentLoadingException.java b/java-util/src/main/java/io/druid/segment/loading/SegmentLoadingException.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/SegmentLoadingException.java
rename to java-util/src/main/java/io/druid/segment/loading/SegmentLoadingException.java
diff --git a/api/src/main/java/io/druid/segment/loading/URIDataPuller.java b/java-util/src/main/java/io/druid/segment/loading/URIDataPuller.java
similarity index 100%
rename from api/src/main/java/io/druid/segment/loading/URIDataPuller.java
rename to java-util/src/main/java/io/druid/segment/loading/URIDataPuller.java
diff --git a/api/src/main/java/io/druid/tasklogs/NoopTaskLogs.java b/java-util/src/main/java/io/druid/tasklogs/NoopTaskLogs.java
similarity index 100%
rename from api/src/main/java/io/druid/tasklogs/NoopTaskLogs.java
rename to java-util/src/main/java/io/druid/tasklogs/NoopTaskLogs.java
diff --git a/api/src/main/java/io/druid/tasklogs/TaskLogKiller.java b/java-util/src/main/java/io/druid/tasklogs/TaskLogKiller.java
similarity index 100%
rename from api/src/main/java/io/druid/tasklogs/TaskLogKiller.java
rename to java-util/src/main/java/io/druid/tasklogs/TaskLogKiller.java
diff --git a/api/src/main/java/io/druid/tasklogs/TaskLogPusher.java b/java-util/src/main/java/io/druid/tasklogs/TaskLogPusher.java
similarity index 100%
rename from api/src/main/java/io/druid/tasklogs/TaskLogPusher.java
rename to java-util/src/main/java/io/druid/tasklogs/TaskLogPusher.java
diff --git a/api/src/main/java/io/druid/tasklogs/TaskLogStreamer.java b/java-util/src/main/java/io/druid/tasklogs/TaskLogStreamer.java
similarity index 100%
rename from api/src/main/java/io/druid/tasklogs/TaskLogStreamer.java
rename to java-util/src/main/java/io/druid/tasklogs/TaskLogStreamer.java
diff --git a/api/src/main/java/io/druid/tasklogs/TaskLogs.java b/java-util/src/main/java/io/druid/tasklogs/TaskLogs.java
similarity index 100%
rename from api/src/main/java/io/druid/tasklogs/TaskLogs.java
rename to java-util/src/main/java/io/druid/tasklogs/TaskLogs.java
diff --git a/api/src/main/java/io/druid/timeline/DataSegment.java b/java-util/src/main/java/io/druid/timeline/DataSegment.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/DataSegment.java
rename to java-util/src/main/java/io/druid/timeline/DataSegment.java
diff --git a/api/src/main/java/io/druid/timeline/DataSegmentUtils.java b/java-util/src/main/java/io/druid/timeline/DataSegmentUtils.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/DataSegmentUtils.java
rename to java-util/src/main/java/io/druid/timeline/DataSegmentUtils.java
diff --git a/common/src/main/java/io/druid/timeline/LogicalSegment.java b/java-util/src/main/java/io/druid/timeline/LogicalSegment.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/LogicalSegment.java
rename to java-util/src/main/java/io/druid/timeline/LogicalSegment.java
diff --git a/api/src/main/java/io/druid/timeline/PruneLoadSpec.java b/java-util/src/main/java/io/druid/timeline/PruneLoadSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/PruneLoadSpec.java
rename to java-util/src/main/java/io/druid/timeline/PruneLoadSpec.java
diff --git a/common/src/main/java/io/druid/timeline/TimelineLookup.java b/java-util/src/main/java/io/druid/timeline/TimelineLookup.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/TimelineLookup.java
rename to java-util/src/main/java/io/druid/timeline/TimelineLookup.java
diff --git a/common/src/main/java/io/druid/timeline/TimelineObjectHolder.java b/java-util/src/main/java/io/druid/timeline/TimelineObjectHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/TimelineObjectHolder.java
rename to java-util/src/main/java/io/druid/timeline/TimelineObjectHolder.java
diff --git a/common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java b/java-util/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
rename to java-util/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
diff --git a/common/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java b/java-util/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
rename to java-util/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
diff --git a/common/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
diff --git a/common/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
diff --git a/api/src/main/java/io/druid/timeline/partition/NoneShardSpec.java b/java-util/src/main/java/io/druid/timeline/partition/NoneShardSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/partition/NoneShardSpec.java
rename to java-util/src/main/java/io/druid/timeline/partition/NoneShardSpec.java
diff --git a/common/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
diff --git a/api/src/main/java/io/druid/timeline/partition/PartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/PartitionChunk.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/partition/PartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/PartitionChunk.java
diff --git a/common/src/main/java/io/druid/timeline/partition/PartitionHolder.java b/java-util/src/main/java/io/druid/timeline/partition/PartitionHolder.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/PartitionHolder.java
rename to java-util/src/main/java/io/druid/timeline/partition/PartitionHolder.java
diff --git a/api/src/main/java/io/druid/timeline/partition/ShardSpec.java b/java-util/src/main/java/io/druid/timeline/partition/ShardSpec.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/partition/ShardSpec.java
rename to java-util/src/main/java/io/druid/timeline/partition/ShardSpec.java
diff --git a/api/src/main/java/io/druid/timeline/partition/ShardSpecLookup.java b/java-util/src/main/java/io/druid/timeline/partition/ShardSpecLookup.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/partition/ShardSpecLookup.java
rename to java-util/src/main/java/io/druid/timeline/partition/ShardSpecLookup.java
diff --git a/api/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
similarity index 100%
rename from api/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
diff --git a/common/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java b/java-util/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
similarity index 100%
rename from common/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
rename to java-util/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
diff --git a/api/src/main/java/io/druid/utils/CircularBuffer.java b/java-util/src/main/java/io/druid/utils/CircularBuffer.java
similarity index 100%
rename from api/src/main/java/io/druid/utils/CircularBuffer.java
rename to java-util/src/main/java/io/druid/utils/CircularBuffer.java
diff --git a/api/src/main/java/io/druid/utils/CompressionUtils.java b/java-util/src/main/java/io/druid/utils/CompressionUtils.java
similarity index 100%
rename from api/src/main/java/io/druid/utils/CompressionUtils.java
rename to java-util/src/main/java/io/druid/utils/CompressionUtils.java
diff --git a/api/src/main/java/io/druid/utils/Runnables.java b/java-util/src/main/java/io/druid/utils/Runnables.java
similarity index 100%
rename from api/src/main/java/io/druid/utils/Runnables.java
rename to java-util/src/main/java/io/druid/utils/Runnables.java
diff --git a/common/src/main/resources/log4j2.debug.xml b/java-util/src/main/resources/log4j2.debug.xml
similarity index 100%
rename from common/src/main/resources/log4j2.debug.xml
rename to java-util/src/main/resources/log4j2.debug.xml
diff --git a/common/src/main/resources/log4j2.xml b/java-util/src/main/resources/log4j2.xml
similarity index 100%
rename from common/src/main/resources/log4j2.xml
rename to java-util/src/main/resources/log4j2.xml
diff --git a/common/src/main/resources/services/javax.annotation.processing.Processor b/java-util/src/main/resources/services/javax.annotation.processing.Processor
similarity index 100%
rename from common/src/main/resources/services/javax.annotation.processing.Processor
rename to java-util/src/main/resources/services/javax.annotation.processing.Processor
diff --git a/api/src/test/java/io/druid/TestObjectMapper.java b/java-util/src/test/java/io/druid/TestObjectMapper.java
similarity index 100%
rename from api/src/test/java/io/druid/TestObjectMapper.java
rename to java-util/src/test/java/io/druid/TestObjectMapper.java
diff --git a/common/src/test/java/io/druid/collections/BlockingPoolTest.java b/java-util/src/test/java/io/druid/collections/BlockingPoolTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/BlockingPoolTest.java
rename to java-util/src/test/java/io/druid/collections/BlockingPoolTest.java
diff --git a/common/src/test/java/io/druid/collections/CombiningIterableTest.java b/java-util/src/test/java/io/druid/collections/CombiningIterableTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/CombiningIterableTest.java
rename to java-util/src/test/java/io/druid/collections/CombiningIterableTest.java
diff --git a/common/src/test/java/io/druid/collections/CombiningIteratorTest.java b/java-util/src/test/java/io/druid/collections/CombiningIteratorTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/CombiningIteratorTest.java
rename to java-util/src/test/java/io/druid/collections/CombiningIteratorTest.java
diff --git a/common/src/test/java/io/druid/collections/IteratorShell.java b/java-util/src/test/java/io/druid/collections/IteratorShell.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/IteratorShell.java
rename to java-util/src/test/java/io/druid/collections/IteratorShell.java
diff --git a/common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java b/java-util/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
rename to java-util/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
diff --git a/common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java b/java-util/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
rename to java-util/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
diff --git a/common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java b/java-util/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java
rename to java-util/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java
diff --git a/common/src/test/java/io/druid/collections/SerializablePairTest.java b/java-util/src/test/java/io/druid/collections/SerializablePairTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/SerializablePairTest.java
rename to java-util/src/test/java/io/druid/collections/SerializablePairTest.java
diff --git a/common/src/test/java/io/druid/collections/StupidPoolTest.java b/java-util/src/test/java/io/druid/collections/StupidPoolTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/StupidPoolTest.java
rename to java-util/src/test/java/io/druid/collections/StupidPoolTest.java
diff --git a/common/src/test/java/io/druid/collections/StupidResourceHolderTest.java b/java-util/src/test/java/io/druid/collections/StupidResourceHolderTest.java
similarity index 100%
rename from common/src/test/java/io/druid/collections/StupidResourceHolderTest.java
rename to java-util/src/test/java/io/druid/collections/StupidResourceHolderTest.java
diff --git a/common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java b/java-util/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
rename to java-util/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
diff --git a/common/src/test/java/io/druid/common/guava/ComplexSequenceTest.java b/java-util/src/test/java/io/druid/common/guava/ComplexSequenceTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/guava/ComplexSequenceTest.java
rename to java-util/src/test/java/io/druid/common/guava/ComplexSequenceTest.java
diff --git a/common/src/test/java/io/druid/common/guava/GuavaUtilsTest.java b/java-util/src/test/java/io/druid/common/guava/GuavaUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/guava/GuavaUtilsTest.java
rename to java-util/src/test/java/io/druid/common/guava/GuavaUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/IntArrayUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/IntArrayUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/IntArrayUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/IntArrayUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/JodaUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/JodaUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/JodaUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/JodaUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/LogTest.java b/java-util/src/test/java/io/druid/common/utils/LogTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/LogTest.java
rename to java-util/src/test/java/io/druid/common/utils/LogTest.java
diff --git a/common/src/test/java/io/druid/common/utils/PropUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/PropUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/PropUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/PropUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/SerializerUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/SerializerUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/SerializerUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/SerializerUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/ServletResourceUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/ServletResourceUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/ServletResourceUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/ServletResourceUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/SocketUtilTest.java b/java-util/src/test/java/io/druid/common/utils/SocketUtilTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/SocketUtilTest.java
rename to java-util/src/test/java/io/druid/common/utils/SocketUtilTest.java
diff --git a/common/src/test/java/io/druid/common/utils/StringUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/StringUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/StringUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/StringUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/UUIDUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/UUIDUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/UUIDUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/UUIDUtilsTest.java
diff --git a/common/src/test/java/io/druid/common/utils/VMUtilsTest.java b/java-util/src/test/java/io/druid/common/utils/VMUtilsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/common/utils/VMUtilsTest.java
rename to java-util/src/test/java/io/druid/common/utils/VMUtilsTest.java
diff --git a/common/src/test/java/io/druid/concurrent/ExecsTest.java b/java-util/src/test/java/io/druid/concurrent/ExecsTest.java
similarity index 100%
rename from common/src/test/java/io/druid/concurrent/ExecsTest.java
rename to java-util/src/test/java/io/druid/concurrent/ExecsTest.java
diff --git a/common/src/test/java/io/druid/concurrent/LifecycleLockTest.java b/java-util/src/test/java/io/druid/concurrent/LifecycleLockTest.java
similarity index 100%
rename from common/src/test/java/io/druid/concurrent/LifecycleLockTest.java
rename to java-util/src/test/java/io/druid/concurrent/LifecycleLockTest.java
diff --git a/api/src/test/java/io/druid/data/input/MapBasedRowTest.java b/java-util/src/test/java/io/druid/data/input/MapBasedRowTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/MapBasedRowTest.java
rename to java-util/src/test/java/io/druid/data/input/MapBasedRowTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/DimensionSchemaTest.java b/java-util/src/test/java/io/druid/data/input/impl/DimensionSchemaTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/DimensionSchemaTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/DimensionSchemaTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/DimensionsSpecSerdeTest.java b/java-util/src/test/java/io/druid/data/input/impl/DimensionsSpecSerdeTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/DimensionsSpecSerdeTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/DimensionsSpecSerdeTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java b/java-util/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/InputRowParserSerdeTest.java b/java-util/src/test/java/io/druid/data/input/impl/InputRowParserSerdeTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/InputRowParserSerdeTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/InputRowParserSerdeTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/JSONParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/JSONParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/JSONParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/JSONParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/JSONPathSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/JSONPathSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/JSONPathSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/JSONPathSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/JavaScriptParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/JavaScriptParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/JavaScriptParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/JavaScriptParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/NoopInputRowParserTest.java b/java-util/src/test/java/io/druid/data/input/impl/NoopInputRowParserTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/NoopInputRowParserTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/NoopInputRowParserTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/ParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/ParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/RegexParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/RegexParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/RegexParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/RegexParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/StringInputRowParserTest.java b/java-util/src/test/java/io/druid/data/input/impl/StringInputRowParserTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/StringInputRowParserTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/StringInputRowParserTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/TimeAndDimsParseSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/TimeAndDimsParseSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/TimeAndDimsParseSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/TimeAndDimsParseSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java b/java-util/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java b/java-util/src/test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
diff --git a/api/src/test/java/io/druid/data/input/impl/prefetch/RetryingInputStreamTest.java b/java-util/src/test/java/io/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
similarity index 100%
rename from api/src/test/java/io/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
rename to java-util/src/test/java/io/druid/data/input/impl/prefetch/RetryingInputStreamTest.java
diff --git a/api/src/test/java/io/druid/guice/ConditionalMultibindTest.java b/java-util/src/test/java/io/druid/guice/ConditionalMultibindTest.java
similarity index 100%
rename from api/src/test/java/io/druid/guice/ConditionalMultibindTest.java
rename to java-util/src/test/java/io/druid/guice/ConditionalMultibindTest.java
diff --git a/api/src/test/java/io/druid/guice/JsonConfiguratorTest.java b/java-util/src/test/java/io/druid/guice/JsonConfiguratorTest.java
similarity index 100%
rename from api/src/test/java/io/druid/guice/JsonConfiguratorTest.java
rename to java-util/src/test/java/io/druid/guice/JsonConfiguratorTest.java
diff --git a/common/src/test/java/io/druid/guice/LifecycleScopeTest.java b/java-util/src/test/java/io/druid/guice/LifecycleScopeTest.java
similarity index 100%
rename from common/src/test/java/io/druid/guice/LifecycleScopeTest.java
rename to java-util/src/test/java/io/druid/guice/LifecycleScopeTest.java
diff --git a/api/src/test/java/io/druid/guice/PolyBindTest.java b/java-util/src/test/java/io/druid/guice/PolyBindTest.java
similarity index 100%
rename from api/src/test/java/io/druid/guice/PolyBindTest.java
rename to java-util/src/test/java/io/druid/guice/PolyBindTest.java
diff --git a/api/src/test/java/io/druid/indexer/TaskStatusPlusTest.java b/java-util/src/test/java/io/druid/indexer/TaskStatusPlusTest.java
similarity index 100%
rename from api/src/test/java/io/druid/indexer/TaskStatusPlusTest.java
rename to java-util/src/test/java/io/druid/indexer/TaskStatusPlusTest.java
diff --git a/api/src/test/java/io/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java b/java-util/src/test/java/io/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
similarity index 100%
rename from api/src/test/java/io/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
rename to java-util/src/test/java/io/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
diff --git a/api/src/test/java/io/druid/js/JavaScriptConfigTest.java b/java-util/src/test/java/io/druid/js/JavaScriptConfigTest.java
similarity index 100%
rename from api/src/test/java/io/druid/js/JavaScriptConfigTest.java
rename to java-util/src/test/java/io/druid/js/JavaScriptConfigTest.java
diff --git a/common/src/test/java/io/druid/math/expr/EvalTest.java b/java-util/src/test/java/io/druid/math/expr/EvalTest.java
similarity index 100%
rename from common/src/test/java/io/druid/math/expr/EvalTest.java
rename to java-util/src/test/java/io/druid/math/expr/EvalTest.java
diff --git a/common/src/test/java/io/druid/math/expr/FunctionTest.java b/java-util/src/test/java/io/druid/math/expr/FunctionTest.java
similarity index 100%
rename from common/src/test/java/io/druid/math/expr/FunctionTest.java
rename to java-util/src/test/java/io/druid/math/expr/FunctionTest.java
diff --git a/common/src/test/java/io/druid/math/expr/ParserTest.java b/java-util/src/test/java/io/druid/math/expr/ParserTest.java
similarity index 100%
rename from common/src/test/java/io/druid/math/expr/ParserTest.java
rename to java-util/src/test/java/io/druid/math/expr/ParserTest.java
diff --git a/common/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java b/java-util/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java
similarity index 100%
rename from common/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java
rename to java-util/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java
diff --git a/common/src/test/java/io/druid/metadata/EnvironmentVariablePasswordProviderTest.java b/java-util/src/test/java/io/druid/metadata/EnvironmentVariablePasswordProviderTest.java
similarity index 100%
rename from common/src/test/java/io/druid/metadata/EnvironmentVariablePasswordProviderTest.java
rename to java-util/src/test/java/io/druid/metadata/EnvironmentVariablePasswordProviderTest.java
diff --git a/common/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java b/java-util/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java
similarity index 100%
rename from common/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java
rename to java-util/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java
diff --git a/api/src/test/java/io/druid/segment/SegmentUtilsTest.java b/java-util/src/test/java/io/druid/segment/SegmentUtilsTest.java
similarity index 100%
rename from api/src/test/java/io/druid/segment/SegmentUtilsTest.java
rename to java-util/src/test/java/io/druid/segment/SegmentUtilsTest.java
diff --git a/api/src/test/java/io/druid/timeline/DataSegmentTest.java b/java-util/src/test/java/io/druid/timeline/DataSegmentTest.java
similarity index 100%
rename from api/src/test/java/io/druid/timeline/DataSegmentTest.java
rename to java-util/src/test/java/io/druid/timeline/DataSegmentTest.java
diff --git a/api/src/test/java/io/druid/timeline/DataSegmentUtilsTest.java b/java-util/src/test/java/io/druid/timeline/DataSegmentUtilsTest.java
similarity index 100%
rename from api/src/test/java/io/druid/timeline/DataSegmentUtilsTest.java
rename to java-util/src/test/java/io/druid/timeline/DataSegmentUtilsTest.java
diff --git a/common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java b/java-util/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
similarity index 100%
rename from common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
rename to java-util/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
diff --git a/common/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java b/java-util/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
similarity index 100%
rename from common/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
rename to java-util/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
diff --git a/api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java b/java-util/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java
similarity index 100%
rename from api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java
rename to java-util/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java
diff --git a/common/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java b/java-util/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
similarity index 100%
rename from common/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
rename to java-util/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
diff --git a/java-util/src/test/resources/log4j2.xml b/java-util/src/test/resources/log4j2.xml
index 689cbbf6b1c2..c699fa227f07 100644
--- a/java-util/src/test/resources/log4j2.xml
+++ b/java-util/src/test/resources/log4j2.xml
@@ -28,5 +28,8 @@
     <Root level="debug">
       <AppenderRef ref="Console"/>
     </Root>
+    <Logger level="debug" name="io.druid" additivity="false">
+      <AppenderRef ref="Console"/>
+    </Logger>
   </Loggers>
 </Configuration>
diff --git a/processing/src/main/java/io/druid/segment/column/ValueType.java b/processing/src/main/java/io/druid/segment/column/ValueType.java
index d7154eaaf0b7..33c7ca5b4e0c 100644
--- a/processing/src/main/java/io/druid/segment/column/ValueType.java
+++ b/processing/src/main/java/io/druid/segment/column/ValueType.java
@@ -30,7 +30,7 @@
 
 /**
  * Should be the same as {@link io.druid.data.input.impl.DimensionSchema.ValueType}.
- * TODO merge them when druid-api is merged back into the main repo
+ * TODO merge them when java-util is merged with druid-processing into a single druid-core module.
  */
 public enum ValueType
 {
diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
index ecfd6b95a7a9..1ddf58ce01bd 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
@@ -103,8 +103,10 @@ public abstract class IncrementalIndex<AggregatorType> extends AbstractIndex imp
 {
   private volatile DateTime maxIngestedEventTime;
 
-  // Used to discover ValueType based on the class of values in a row
-  // Also used to convert between the duplicate ValueType enums in DimensionSchema (druid-api) and main druid.
+  /**
+   * Used to discover ValueType based on the class of values in a row
+   * TODO remove when {@link ValueType} is merged with {@link DimensionSchema.ValueType}
+   */
   public static final Map<Object, ValueType> TYPE_MAP = ImmutableMap.<Object, ValueType>builder()
       .put(Long.class, ValueType.LONG)
       .put(Double.class, ValueType.DOUBLE)
diff --git a/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java b/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java
index 0086160e9021..c79d257a3171 100644
--- a/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java
+++ b/server/src/main/java/io/druid/server/emitter/HttpEmitterSSLClientConfig.java
@@ -24,15 +24,7 @@
 import io.druid.metadata.PasswordProvider;
 
 /**
- * This is kept separate from {@link io.druid.java.util.emitter.core.HttpEmitterConfig} because {@link PasswordProvider}
- * is currently located in druid-api. The java-util module which contains HttpEmitterConfig cannot import
- * PasswordProvider because this would introduce a circular dependence between java-util and druid-api.
- *
- * PasswordProvider could be moved to java-util, but PasswordProvider is annotated with
- * {@link io.druid.guice.annotations.ExtensionPoint}, which would also have to be moved.
- *
- * It would be easier to resolve these issues and merge the TLS-related config with HttpEmitterConfig once
- * https://github.com/druid-io/druid/issues/4312 is resolved, so the TLS config is kept separate for now.
+ * TODO merge with {@link io.druid.java.util.emitter.core.HttpEmitterConfig}
  */
 public class HttpEmitterSSLClientConfig
 {