From bd0756e36021452c8d13b92af26a819b973be5c6 Mon Sep 17 00:00:00 2001
From: cheddar <cheddar@metamarkets.com>
Date: Fri, 30 Aug 2013 18:58:28 -0500
Subject: [PATCH] More stuff moved, things still compiling and tests still
 passing.  Yay!

---
 common/pom.xml                                |  3 +-
 .../druid/config/ConfigManagerConfig.java     | 20 -------
 .../com/metamx/druid/config/ConfigSerde.java  |  9 ---
 .../com/metamx/druid/utils/SocketUtil.java    | 39 -------------
 .../druid/collections}/CombiningIterable.java |  4 +-
 .../druid/collections}/CombiningIterator.java |  4 +-
 .../druid/collections}/CountingMap.java       |  4 +-
 .../druid/collections}/IntList.java           |  4 +-
 .../collections}/OrderedMergeIterator.java    |  4 +-
 .../collections}/OrderedMergeSequence.java    |  4 +-
 .../druid/collections}/ResourceHolder.java    |  4 +-
 .../druid/collections}/StupidPool.java        |  4 +-
 .../collections}/StupidResourceHolder.java    |  4 +-
 .../druid/common}/config/ConfigManager.java   | 23 +++++++-
 .../common/config/ConfigManagerConfig.java    | 39 +++++++++++++
 .../io/druid/common/config/ConfigSerde.java   | 28 +++++++++
 .../common}/config/JacksonConfigManager.java  |  4 +-
 .../common}/guava/CombiningSequence.java      |  4 +-
 .../druid/common}/guava/DSuppliers.java       |  2 +-
 .../common}/guava/FileOutputSupplier.java     |  4 +-
 .../druid/common}/guava/GuavaUtils.java       |  4 +-
 .../druid/common}/guava/Runnables.java        |  4 +-
 .../common}/guava/ThreadRenamingCallable.java |  4 +-
 .../common}/guava/ThreadRenamingRunnable.java |  4 +-
 .../druid/common}/utils/CompressionUtils.java |  4 +-
 .../druid/common}/utils/JodaUtils.java        |  4 +-
 .../druid/common}/utils/PropUtils.java        |  4 +-
 .../druid/common}/utils/SerializerUtils.java  |  6 +-
 .../io/druid/common/utils/SocketUtil.java     | 58 +++++++++++++++++++
 .../metamx => io}/druid/concurrent/Execs.java |  4 +-
 .../druid/data}/input/InputRow.java           |  4 +-
 .../druid/data}/input/MapBasedInputRow.java   |  4 +-
 .../druid/data}/input/MapBasedRow.java        |  5 +-
 .../druid => io/druid/data}/input/Row.java    |  4 +-
 .../druid => io/druid/data}/input/Rows.java   |  4 +-
 .../metamx => io}/druid/db/DbConnector.java   |  4 +-
 .../druid/db/DbConnectorConfig.java           |  4 +-
 .../druid/db/DbTablesConfig.java              | 21 ++++++-
 .../druid/guice/guice/DbConnectorModule.java  |  6 +-
 .../guice/JacksonConfigManagerModule.java     | 10 ++--
 .../guice/guice/JacksonConfigProvider.java    |  4 +-
 .../druid/timeline}/LogicalSegment.java       |  2 +-
 .../druid/timeline}/TimelineObjectHolder.java |  4 +-
 .../timeline}/VersionedIntervalTimeline.java  | 10 ++--
 .../partition/ImmutablePartitionHolder.java   |  4 +-
 .../partition/IntegerPartitionChunk.java      |  4 +-
 .../partition/LinearPartitionChunk.java       | 21 ++++++-
 .../partition/NumberedPartitionChunk.java     |  4 +-
 .../timeline}/partition/PartitionChunk.java   |  4 +-
 .../timeline}/partition/PartitionHolder.java  |  4 +-
 .../SingleElementPartitionChunk.java          |  4 +-
 .../partition/StringPartitionChunk.java       |  4 +-
 .../druid/collections}/IntListTest.java       |  4 +-
 .../druid/collections}/IteratorShell.java     |  4 +-
 .../OrderedMergeIteratorTest.java             |  4 +-
 .../OrderedMergeSequenceTest.java             |  4 +-
 .../common}/guava/CombiningSequenceTest.java  |  4 +-
 .../druid/common}/utils/JodaUtilsTest.java    |  4 +-
 .../VersionedIntervalTimelineTest.java        | 14 ++---
 .../partition/IntegerPartitionChunkTest.java  |  6 +-
 .../partition/StringPartitionChunkTest.java   |  6 +-
 .../examples/flights/FlightsConverter.java    |  4 +-
 .../flights/FlightsFirehoseFactory.java       |  2 +-
 .../examples/rand/RandomFirehoseFactory.java  | 23 +++++++-
 .../TwitterSpritzerFirehoseFactory.java       | 23 +++++++-
 .../web/InputSupplierUpdateStream.java        |  4 +-
 .../examples/web/WebFirehoseFactory.java      |  8 +--
 .../examples/web/WebFirehoseFactoryTest.java  |  4 +-
 .../metamx/druid/indexer/DbUpdaterJob.java    |  4 +-
 .../druid/indexer/DeterminePartitionsJob.java |  4 +-
 .../indexer/HadoopDruidIndexerConfig.java     |  6 +-
 .../indexer/HadoopDruidIndexerMapper.java     |  2 +-
 .../druid/indexer/IndexGeneratorJob.java      |  2 +-
 .../java/com/metamx/druid/indexer/Utils.java  |  4 +-
 .../indexer/updater/DbUpdaterJobSpec.java     |  4 +-
 .../indexer/HadoopDruidIndexerConfigTest.java |  6 +-
 .../granularity/ArbitraryGranularityTest.java |  5 +-
 .../granularity/UniformGranularityTest.java   |  5 +-
 .../index/EventReceiverFirehoseFactory.java   |  2 +-
 .../common/index/StaticS3FirehoseFactory.java |  2 +-
 .../indexing/common/task/AppendTask.java      |  4 +-
 .../indexing/common/task/HadoopIndexTask.java |  2 +-
 .../task/IndexDeterminePartitionsTask.java    |  2 +-
 .../common/task/IndexGeneratorTask.java       |  2 +-
 .../common/task/RealtimeIndexTask.java        |  2 +-
 .../indexing/coordinator/DbTaskStorage.java   |  4 +-
 .../coordinator/IndexerDBCoordinator.java     |  8 +--
 .../coordinator/ThreadPoolTaskRunner.java     |  2 +-
 .../config/IndexerDbConnectorConfig.java      |  5 +-
 .../http/IndexerCoordinatorResource.java      |  2 +-
 .../http/OldIndexerCoordinatorResource.java   | 21 ++++++-
 .../indexing/worker/WorkerTaskMonitor.java    |  2 +-
 .../worker/executor/ExecutorLifecycle.java    | 21 ++++++-
 .../indexing/common/task/TaskSerdeTest.java   |  6 +-
 .../common/task/VersionConverterTaskTest.java |  2 +-
 .../coordinator/RemoteTaskRunnerTest.java     |  4 +-
 .../coordinator/TaskLifecycleTest.java        |  8 +--
 .../scaling/EC2AutoScalingStrategyTest.java   |  6 +-
 .../SimpleResourceManagementStrategyTest.java |  4 +-
 .../indexing/worker/TaskAnnouncementTest.java |  2 +-
 processing/pom.xml                            |  9 +++
 .../io/druid/data/input/InputRowParser.java   |  1 -
 .../druid/data/input/MapInputRowParser.java   |  2 -
 .../data/input/ProtoBufInputRowParser.java    |  1 -
 .../data/input/StringInputRowParser.java      |  1 -
 .../io}/druid/jackson/AggregatorsModule.java  | 22 +++----
 .../jackson/CommaListJoinDeserializer.java    |  4 +-
 .../jackson/CommaListJoinSerializer.java      |  4 +-
 .../druid/jackson/DefaultObjectMapper.java    |  2 +-
 .../DruidDefaultSerializersModule.java        |  2 +-
 .../java/io}/druid/jackson/JacksonModule.java |  2 +-
 .../java/io}/druid/jackson/JodaStuff.java     |  4 +-
 .../druid/jackson/QueryGranularityModule.java |  2 +-
 .../java/io/druid/query/QueryToolChest.java   |  2 +-
 .../druid/query/ResultMergeQueryRunner.java   |  2 +-
 .../query}/aggregation/CountAggregator.java   |  4 +-
 .../aggregation/CountAggregatorFactory.java   |  5 +-
 .../aggregation/CountBufferAggregator.java    |  4 +-
 .../aggregation/DoubleSumAggregator.java      |  3 +-
 .../DoubleSumAggregatorFactory.java           |  5 +-
 .../DoubleSumBufferAggregator.java            |  3 +-
 .../druid/query}/aggregation/Histogram.java   |  2 +-
 .../aggregation/HistogramAggregator.java      |  3 +-
 .../HistogramAggregatorFactory.java           |  5 +-
 .../HistogramBufferAggregator.java            |  3 +-
 .../query}/aggregation/HistogramVisual.java   |  2 +-
 .../aggregation/JavaScriptAggregator.java     |  3 +-
 .../JavaScriptAggregatorFactory.java          |  5 +-
 .../JavaScriptBufferAggregator.java           |  3 +-
 .../query}/aggregation/LongSumAggregator.java |  3 +-
 .../aggregation/LongSumAggregatorFactory.java |  5 +-
 .../aggregation/LongSumBufferAggregator.java  |  3 +-
 .../query}/aggregation/MaxAggregator.java     |  3 +-
 .../aggregation/MaxAggregatorFactory.java     |  5 +-
 .../aggregation/MaxBufferAggregator.java      |  3 +-
 .../query}/aggregation/MinAggregator.java     |  3 +-
 .../aggregation/MinAggregatorFactory.java     |  5 +-
 .../aggregation/MinBufferAggregator.java      |  3 +-
 .../query}/aggregation/NoopAggregator.java    |  4 +-
 .../aggregation/NoopBufferAggregator.java     |  4 +-
 .../ToLowerCaseAggregatorFactory.java         |  5 +-
 .../post/ArithmeticPostAggregator.java        |  2 +-
 .../post/ConstantPostAggregator.java          |  2 +-
 .../post/FieldAccessPostAggregator.java       |  2 +-
 .../io/druid/query/groupby/GroupByQuery.java  |  2 +-
 .../groupby/GroupByQueryQueryToolChest.java   |  6 +-
 .../groupby/having/AlwaysHavingSpec.java      |  2 +-
 .../query/groupby/having/AndHavingSpec.java   |  2 +-
 .../groupby/having/EqualToHavingSpec.java     |  2 +-
 .../groupby/having/GreaterThanHavingSpec.java |  2 +-
 .../query/groupby/having/HavingSpec.java      |  2 +-
 .../groupby/having/LessThanHavingSpec.java    |  2 +-
 .../query/groupby/having/NotHavingSpec.java   |  2 +-
 .../query/groupby/having/OrHavingSpec.java    |  2 +-
 .../groupby/orderby/DefaultLimitSpec.java     |  2 +-
 .../query/groupby/orderby/LimitSpec.java      |  2 +-
 .../query/groupby/orderby/NoopLimitSpec.java  |  2 +-
 .../SegmentMetadataQueryQueryToolChest.java   |  4 +-
 .../search/SearchQueryQueryToolChest.java     |  2 +-
 .../spec/MultipleIntervalSegmentSpec.java     |  2 +-
 .../spec/MultipleSpecificSegmentSpec.java     |  2 +-
 .../TimeBoundaryQueryQueryToolChest.java      |  4 +-
 .../TimeseriesQueryQueryToolChest.java        |  2 +-
 .../io/druid/segment/CompressedPools.java     |  4 +-
 .../main/java/io/druid/segment/IndexIO.java   |  4 +-
 .../java/io/druid/segment/IndexMerger.java    | 12 ++--
 .../java/io/druid/segment/MetricHolder.java   |  2 +-
 .../data/CompressedFloatsIndexedSupplier.java |  4 +-
 .../CompressedFloatsSupplierSerializer.java   |  4 +-
 .../data/CompressedLongsIndexedSupplier.java  |  4 +-
 .../CompressedLongsSupplierSerializer.java    |  4 +-
 .../data/CompressedObjectStrategy.java        |  2 +-
 .../data/InMemoryCompressedFloats.java        |  4 +-
 .../segment/data/InMemoryCompressedLongs.java |  4 +-
 .../segment/data/IntBufferIndexedInts.java    |  2 +-
 .../segment/incremental/IncrementalIndex.java |  6 +-
 .../SpatialDimensionRowFormatter.java         |  2 +-
 .../segment/serde/ComplexMetricExtractor.java |  2 +-
 .../collections/CombiningIterableTest.java    |  1 -
 .../data/input/InputRowParserSerdeTest.java   |  3 +-
 .../input/ProtoBufInputRowParserTest.java     |  1 -
 .../granularity}/QueryGranularityTest.java    |  7 +--
 .../jackson/DefaultObjectMapperTest.java      |  2 +-
 .../test/java/io/druid/query/QueriesTest.java | 10 ++--
 .../aggregation/CountAggregatorTest.java      |  2 +-
 .../aggregation/DoubleSumAggregatorTest.java  |  2 +-
 .../aggregation/HistogramAggregatorTest.java  |  4 +-
 .../query/aggregation}/HistogramTest.java     |  5 +-
 .../aggregation/JavaScriptAggregatorTest.java |  4 +-
 .../aggregation/LongSumAggregatorTest.java    |  2 +-
 .../query}/aggregation/MaxAggregatorTest.java |  2 +-
 .../aggregation/MetricSelectorUtils.java      |  2 +-
 .../query}/aggregation/MinAggregatorTest.java |  2 +-
 .../aggregation/TestFloatMetricSelector.java  |  2 +-
 .../post/ArithmeticPostAggregatorTest.java    |  4 +-
 .../post/ConstantPostAggregatorTest.java      |  2 +-
 .../post/FieldAccessPostAggregatorTest.java   |  4 +-
 .../query/groupby/having/HavingSpecTest.java  |  6 +-
 .../query/spec/QuerySegmentSpecTest.java      |  2 +-
 .../TimeBoundaryQueryQueryToolChestTest.java  |  2 +-
 .../timeseries/TimeseriesBinaryFnTest.java    | 10 ++--
 ...ompressedFloatsSupplierSerializerTest.java |  2 +-
 ...CompressedLongsSupplierSerializerTest.java |  2 +-
 .../segment/data/IncrementalIndexTest.java    |  4 +-
 .../druid/realtime/DbSegmentPublisher.java    |  2 +-
 .../com/metamx/druid/realtime/Indexer.java    |  4 +-
 .../druid/realtime/RealtimeManager.java       |  2 +-
 .../firehose/ClippedFirehoseFactory.java      | 21 ++++++-
 .../druid/realtime/firehose/Firehose.java     |  4 +-
 .../druid/realtime/firehose/IrcDecoder.java   | 21 ++++++-
 .../realtime/firehose/IrcFirehoseFactory.java |  4 +-
 .../firehose/KafkaFirehoseFactory.java        |  2 +-
 .../realtime/firehose/PredicateFirehose.java  | 21 ++++++-
 .../firehose/RabbitMQFirehoseFactory.java     |  2 +-
 .../firehose/TimedShutoffFirehoseFactory.java | 21 ++++++-
 .../firehose/WikipediaIrcDecoder.java         |  4 +-
 .../plumber/RealtimePlumberSchool.java        | 10 ++--
 .../metamx/druid/realtime/plumber/Sink.java   |  2 +-
 .../guice/DbSegmentPublisherProvider.java     |  2 +-
 .../druid/realtime/RealtimeManagerTest.java   |  6 +-
 .../plumber/RealtimePlumberSchoolTest.java    |  2 +-
 .../druid/realtime/plumber/SinkTest.java      |  4 +-
 .../com/metamx/druid/sql/antlr4/DruidSQL.g4   | 14 ++---
 .../druid/coordination/ServerManager.java     | 10 ++--
 .../metamx/druid/db/DatabaseRuleManager.java  |  3 +-
 .../druid/db/DatabaseRuleManagerProvider.java |  2 +
 .../druid/db/DatabaseSegmentManager.java      |  9 +--
 .../db/DatabaseSegmentManagerProvider.java    |  2 +
 .../druid/loading/HdfsDataSegmentPuller.java  |  2 +-
 .../druid/loading/HdfsDataSegmentPusher.java  |  2 +-
 .../druid/loading/LocalDataSegmentPuller.java |  2 +-
 .../druid/loading/LocalDataSegmentPusher.java |  2 +-
 .../druid/loading/S3DataSegmentPuller.java    |  2 +-
 .../druid/loading/S3DataSegmentPusher.java    |  2 +-
 .../cassandra/CassandraDataSegmentPuller.java |  2 +-
 .../cassandra/CassandraDataSegmentPusher.java |  2 +-
 .../com/metamx/druid/master/DruidMaster.java  |  4 +-
 .../druid/master/DruidMasterCleanup.java      |  4 +-
 .../druid/master/DruidMasterLogger.java       |  2 +-
 .../master/DruidMasterSegmentMerger.java      |  6 +-
 .../com/metamx/druid/master/MasterStats.java  |  4 +-
 .../metamx/druid/metrics/MetricsModule.java   |  2 +-
 .../druid/query/group/GroupByQueryEngine.java |  8 +--
 .../group/GroupByQueryRunnerFactory.java      |  2 +-
 .../io/druid/client/BrokerServerView.java     |  6 +-
 .../druid/client/CachingClusteredClient.java  |  6 +-
 .../java/io/druid/client/DataSegment.java     |  4 +-
 .../io/druid/client/ServerInventoryView.java  |  2 +-
 .../io/druid/client/TimelineServerView.java   |  2 +-
 .../io/druid/guice/guice/AnnouncerModule.java |  2 +-
 .../guice/guice/DruidProcessingModule.java    |  4 +-
 .../main/java/io/druid/server/DruidNode.java  |  2 +-
 .../http/MasterSegmentSettingsResource.java   |  3 +-
 .../initialization/Initialization.java        |  2 +-
 .../server/shard/shard/LinearShardSpec.java   |  6 +-
 .../server/shard/shard/NoneShardSpec.java     |  6 +-
 .../server/shard/shard/NumberedShardSpec.java |  6 +-
 .../druid/server/shard/shard/ShardSpec.java   |  4 +-
 .../shard/shard/SingleDimensionShardSpec.java |  6 +-
 .../java/io/druid/server/sql/SQLRunner.java   |  4 +-
 .../SegmentChangeRequestDropTest.java         |  2 +-
 .../SegmentChangeRequestLoadTest.java         |  2 +-
 .../druid/coordination/ZkCoordinatorTest.java |  4 +-
 .../druid/db/DatabaseSegmentManagerTest.java  |  5 +-
 .../index/brita/SpatialFilterBonusTest.java   |  6 +-
 .../druid/index/brita/SpatialFilterTest.java  |  6 +-
 .../druid/index/v1/IndexMergerTest.java       |  2 +-
 .../com/metamx/druid/index/v1/TestIndex.java  |  2 +-
 .../druid/query/QueryRunnerTestHelper.java    | 12 ++--
 .../query/group/GroupByQueryRunnerTest.java   | 10 ++--
 .../GroupByTimeseriesQueryRunnerTest.java     |  6 +-
 .../TimeseriesQueryRunnerBonusTest.java       |  4 +-
 .../timeseries/TimeseriesQueryRunnerTest.java |  6 +-
 .../java/io/druid/client/DataSegmentTest.java |  2 +-
 .../client/BatchServerInventoryViewTest.java  |  2 +-
 .../client/selector/ServerSelectorTest.java   |  2 +-
 .../curator/announcement/AnnouncerTest.java   |  2 +-
 .../CuratorInventoryManagerTest.java          |  2 +-
 .../BatchDataSegmentAnnouncerTest.java        |  2 +-
 .../shard/shard/NumberedShardSpecTest.java    |  4 +-
 .../shard/SingleDimensionShardSpecTest.java   |  4 +-
 .../src/main/java/io/druid/cli/CliPeon.java   |  2 +-
 .../java/io/druid/cli/ServerRunnable.java     | 21 ++++++-
 .../initialization}/LogLevelAdjuster.java     |  4 +-
 .../LogLevelAdjusterMBean.java                |  4 +-
 285 files changed, 857 insertions(+), 620 deletions(-)
 delete mode 100644 common/src/main/java/com/metamx/druid/config/ConfigManagerConfig.java
 delete mode 100644 common/src/main/java/com/metamx/druid/config/ConfigSerde.java
 delete mode 100644 common/src/main/java/com/metamx/druid/utils/SocketUtil.java
 rename common/src/main/java/{com/metamx/druid => io/druid/collections}/CombiningIterable.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/collections}/CombiningIterator.java (96%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/CountingMap.java (95%)
 rename common/src/main/java/{com/metamx/druid => io/druid/collections}/IntList.java (97%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/OrderedMergeIterator.java (98%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/OrderedMergeSequence.java (98%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/ResourceHolder.java (91%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/StupidPool.java (96%)
 rename common/src/main/java/{com/metamx/druid/collect => io/druid/collections}/StupidResourceHolder.java (93%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/config/ConfigManager.java (90%)
 create mode 100644 common/src/main/java/io/druid/common/config/ConfigManagerConfig.java
 create mode 100644 common/src/main/java/io/druid/common/config/ConfigSerde.java
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/config/JacksonConfigManager.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/CombiningSequence.java (98%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/DSuppliers.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/FileOutputSupplier.java (94%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/GuavaUtils.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/Runnables.java (93%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/ThreadRenamingCallable.java (94%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/guava/ThreadRenamingRunnable.java (93%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/utils/CompressionUtils.java (98%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/utils/JodaUtils.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/utils/PropUtils.java (95%)
 rename common/src/main/java/{com/metamx/druid => io/druid/common}/utils/SerializerUtils.java (98%)
 create mode 100644 common/src/main/java/io/druid/common/utils/SocketUtil.java
 rename common/src/main/java/{com/metamx => io}/druid/concurrent/Execs.java (95%)
 rename common/src/main/java/{com/metamx/druid => io/druid/data}/input/InputRow.java (96%)
 rename common/src/main/java/{com/metamx/druid => io/druid/data}/input/MapBasedInputRow.java (94%)
 rename common/src/main/java/{com/metamx/druid => io/druid/data}/input/MapBasedRow.java (98%)
 rename common/src/main/java/{com/metamx/druid => io/druid/data}/input/Row.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/data}/input/Rows.java (94%)
 rename common/src/main/java/{com/metamx => io}/druid/db/DbConnector.java (98%)
 rename common/src/main/java/{com/metamx => io}/druid/db/DbConnectorConfig.java (96%)
 rename common/src/main/java/{com/metamx => io}/druid/db/DbTablesConfig.java (73%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/LogicalSegment.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/TimelineObjectHolder.java (95%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/VersionedIntervalTimeline.java (98%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/ImmutablePartitionHolder.java (93%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/IntegerPartitionChunk.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/LinearPartitionChunk.java (66%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/NumberedPartitionChunk.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/PartitionChunk.java (96%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/PartitionHolder.java (97%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/SingleElementPartitionChunk.java (96%)
 rename common/src/main/java/{com/metamx/druid => io/druid/timeline}/partition/StringPartitionChunk.java (97%)
 rename common/src/test/java/{com/metamx/druid => io/druid/collections}/IntListTest.java (95%)
 rename common/src/test/java/{com/metamx/druid/collect => io/druid/collections}/IteratorShell.java (93%)
 rename common/src/test/java/{com/metamx/druid/collect => io/druid/collections}/OrderedMergeIteratorTest.java (98%)
 rename common/src/test/java/{com/metamx/druid/collect => io/druid/collections}/OrderedMergeSequenceTest.java (98%)
 rename common/src/test/java/{com/metamx/druid => io/druid/common}/guava/CombiningSequenceTest.java (98%)
 rename common/src/test/java/{com/metamx/druid => io/druid/common}/utils/JodaUtilsTest.java (97%)
 rename common/src/test/java/{com/metamx/druid => io/druid/timeline}/VersionedIntervalTimelineTest.java (99%)
 rename common/src/test/java/{com/metamx/druid => io/druid/timeline}/partition/IntegerPartitionChunkTest.java (94%)
 rename common/src/test/java/{com/metamx/druid => io/druid/timeline}/partition/StringPartitionChunkTest.java (94%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/AggregatorsModule.java (76%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/CommaListJoinDeserializer.java (94%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/CommaListJoinSerializer.java (95%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/DefaultObjectMapper.java (98%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/DruidDefaultSerializersModule.java (99%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/JacksonModule.java (98%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/JodaStuff.java (98%)
 rename {common/src/main/java/com/metamx => processing/src/main/java/io}/druid/jackson/QueryGranularityModule.java (98%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/CountAggregator.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/CountAggregatorFactory.java (93%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/CountBufferAggregator.java (93%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/DoubleSumAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/DoubleSumAggregatorFactory.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/DoubleSumBufferAggregator.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/Histogram.java (99%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/HistogramAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/HistogramAggregatorFactory.java (96%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/HistogramBufferAggregator.java (96%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/HistogramVisual.java (98%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/JavaScriptAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/JavaScriptAggregatorFactory.java (97%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/JavaScriptBufferAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/LongSumAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/LongSumAggregatorFactory.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/LongSumBufferAggregator.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MaxAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MaxAggregatorFactory.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MaxBufferAggregator.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MinAggregator.java (95%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MinAggregatorFactory.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/MinBufferAggregator.java (94%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/NoopAggregator.java (93%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/NoopBufferAggregator.java (92%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/ToLowerCaseAggregatorFactory.java (93%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/post/ArithmeticPostAggregator.java (98%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/post/ConstantPostAggregator.java (97%)
 rename {common/src/main/java/io/druid/query/aggregation => processing/src/main/java/io/druid/query}/aggregation/post/FieldAccessPostAggregator.java (97%)
 rename {common/src/test/java/com/metamx/druid => processing/src/test/java/io/druid/granularity}/QueryGranularityTest.java (98%)
 rename {common/src/test/java/com/metamx => processing/src/test/java/io}/druid/jackson/DefaultObjectMapperTest.java (97%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/CountAggregatorTest.java (97%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/DoubleSumAggregatorTest.java (98%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/HistogramAggregatorTest.java (97%)
 rename {common/src/test/java/com/metamx/druid/histogram => processing/src/test/java/io/druid/query/aggregation}/HistogramTest.java (94%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/JavaScriptAggregatorTest.java (98%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/LongSumAggregatorTest.java (98%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/MaxAggregatorTest.java (97%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/MetricSelectorUtils.java (96%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/MinAggregatorTest.java (97%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/TestFloatMetricSelector.java (96%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/post/ArithmeticPostAggregatorTest.java (96%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/post/ConstantPostAggregatorTest.java (97%)
 rename {common/src/test/java/io/druid/query/aggregation => processing/src/test/java/io/druid/query}/aggregation/post/FieldAccessPostAggregatorTest.java (93%)
 rename {common/src/main/java/com/metamx/druid/log => services/src/main/java/io/druid/initialization}/LogLevelAdjuster.java (96%)
 rename {common/src/main/java/com/metamx/druid/log => services/src/main/java/io/druid/initialization}/LogLevelAdjusterMBean.java (91%)

diff --git a/common/pom.xml b/common/pom.xml
index fba4b3c660e..1716a004688 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Druid - a distributed column store.
-  ~ Copyright (C) 2012  Metamarkets Group Inc.
+  ~ Copyright (C) 2012, 2013  Metamarkets Group Inc.
   ~
   ~ This program is free software; you can redistribute it and/or
   ~ modify it under the terms of the GNU General Public License
@@ -39,7 +39,6 @@
         <dependency>
             <groupId>io.druid</groupId>
             <artifactId>druid-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/common/src/main/java/com/metamx/druid/config/ConfigManagerConfig.java b/common/src/main/java/com/metamx/druid/config/ConfigManagerConfig.java
deleted file mode 100644
index b0eb7f5aa60..00000000000
--- a/common/src/main/java/com/metamx/druid/config/ConfigManagerConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.metamx.druid.config;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.joda.time.Period;
-
-import javax.validation.constraints.NotNull;
-
-/**
- */
-public class ConfigManagerConfig
-{
-  @JsonProperty
-  @NotNull
-  private Period pollDuration = new Period("PT1M");
-
-  public Period getPollDuration()
-  {
-    return pollDuration;
-  }
-}
diff --git a/common/src/main/java/com/metamx/druid/config/ConfigSerde.java b/common/src/main/java/com/metamx/druid/config/ConfigSerde.java
deleted file mode 100644
index 95f0a1ee7d3..00000000000
--- a/common/src/main/java/com/metamx/druid/config/ConfigSerde.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.metamx.druid.config;
-
-/**
-*/
-public interface ConfigSerde<T>
-{
-  public byte[] serialize(T obj);
-  public T deserialize(byte[] bytes);
-}
diff --git a/common/src/main/java/com/metamx/druid/utils/SocketUtil.java b/common/src/main/java/com/metamx/druid/utils/SocketUtil.java
deleted file mode 100644
index efea5f3003f..00000000000
--- a/common/src/main/java/com/metamx/druid/utils/SocketUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.metamx.druid.utils;
-
-import com.metamx.common.ISE;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-/**
- */
-public class SocketUtil
-{
-  public static int findOpenPort(int startPort)
-  {
-    int currPort = startPort;
-
-    while (currPort < 0xffff) {
-      ServerSocket socket = null;
-      try {
-        socket = new ServerSocket(currPort);
-        return currPort;
-      }
-      catch (IOException e) {
-        ++currPort;
-      }
-      finally {
-        if (socket != null) {
-          try {
-            socket.close();
-          }
-          catch (IOException e) {
-
-          }
-        }
-      }
-    }
-
-    throw new ISE("Unable to find open port between[%d] and [%d]", startPort, currPort);
-  }
-}
diff --git a/common/src/main/java/com/metamx/druid/CombiningIterable.java b/common/src/main/java/io/druid/collections/CombiningIterable.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/CombiningIterable.java
rename to common/src/main/java/io/druid/collections/CombiningIterable.java
index 7100656207b..6c0671ecb6f 100644
--- a/common/src/main/java/com/metamx/druid/CombiningIterable.java
+++ b/common/src/main/java/io/druid/collections/CombiningIterable.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.collections;
 
 import com.metamx.common.guava.MergeIterable;
 import com.metamx.common.guava.nary.BinaryFn;
diff --git a/common/src/main/java/com/metamx/druid/CombiningIterator.java b/common/src/main/java/io/druid/collections/CombiningIterator.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/CombiningIterator.java
rename to common/src/main/java/io/druid/collections/CombiningIterator.java
index e8a27af0868..edb52be4731 100644
--- a/common/src/main/java/com/metamx/druid/CombiningIterator.java
+++ b/common/src/main/java/io/druid/collections/CombiningIterator.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.collections;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
diff --git a/common/src/main/java/com/metamx/druid/collect/CountingMap.java b/common/src/main/java/io/druid/collections/CountingMap.java
similarity index 95%
rename from common/src/main/java/com/metamx/druid/collect/CountingMap.java
rename to common/src/main/java/io/druid/collections/CountingMap.java
index 9f9c2eeef88..d0cd1cf3c46 100644
--- a/common/src/main/java/com/metamx/druid/collect/CountingMap.java
+++ b/common/src/main/java/io/druid/collections/CountingMap.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
diff --git a/common/src/main/java/com/metamx/druid/IntList.java b/common/src/main/java/io/druid/collections/IntList.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/IntList.java
rename to common/src/main/java/io/druid/collections/IntList.java
index 364d3659385..c656317d04a 100644
--- a/common/src/main/java/com/metamx/druid/IntList.java
+++ b/common/src/main/java/io/druid/collections/IntList.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.collections;
 
 import java.nio.IntBuffer;
 import java.util.ArrayList;
diff --git a/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java b/common/src/main/java/io/druid/collections/OrderedMergeIterator.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java
rename to common/src/main/java/io/druid/collections/OrderedMergeIterator.java
index f9268aa7e1a..bdf5512e894 100644
--- a/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java
+++ b/common/src/main/java/io/druid/collections/OrderedMergeIterator.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
diff --git a/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java b/common/src/main/java/io/druid/collections/OrderedMergeSequence.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java
rename to common/src/main/java/io/druid/collections/OrderedMergeSequence.java
index 60772e4f474..1b076c4c299 100644
--- a/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java
+++ b/common/src/main/java/io/druid/collections/OrderedMergeSequence.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
diff --git a/common/src/main/java/com/metamx/druid/collect/ResourceHolder.java b/common/src/main/java/io/druid/collections/ResourceHolder.java
similarity index 91%
rename from common/src/main/java/com/metamx/druid/collect/ResourceHolder.java
rename to common/src/main/java/io/druid/collections/ResourceHolder.java
index 32044cce956..aedf756fca3 100644
--- a/common/src/main/java/com/metamx/druid/collect/ResourceHolder.java
+++ b/common/src/main/java/io/druid/collections/ResourceHolder.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import java.io.Closeable;
 
diff --git a/common/src/main/java/com/metamx/druid/collect/StupidPool.java b/common/src/main/java/io/druid/collections/StupidPool.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/collect/StupidPool.java
rename to common/src/main/java/io/druid/collections/StupidPool.java
index 8d5c3f26590..11c0cd166b6 100644
--- a/common/src/main/java/com/metamx/druid/collect/StupidPool.java
+++ b/common/src/main/java/io/druid/collections/StupidPool.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.Lists;
diff --git a/common/src/main/java/com/metamx/druid/collect/StupidResourceHolder.java b/common/src/main/java/io/druid/collections/StupidResourceHolder.java
similarity index 93%
rename from common/src/main/java/com/metamx/druid/collect/StupidResourceHolder.java
rename to common/src/main/java/io/druid/collections/StupidResourceHolder.java
index 953d319889a..069516b25a8 100644
--- a/common/src/main/java/com/metamx/druid/collect/StupidResourceHolder.java
+++ b/common/src/main/java/io/druid/collections/StupidResourceHolder.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import java.io.IOException;
 
diff --git a/common/src/main/java/com/metamx/druid/config/ConfigManager.java b/common/src/main/java/io/druid/common/config/ConfigManager.java
similarity index 90%
rename from common/src/main/java/com/metamx/druid/config/ConfigManager.java
rename to common/src/main/java/io/druid/common/config/ConfigManager.java
index eb9bf67b476..0ec4cd33181 100644
--- a/common/src/main/java/com/metamx/druid/config/ConfigManager.java
+++ b/common/src/main/java/io/druid/common/config/ConfigManager.java
@@ -1,4 +1,23 @@
-package com.metamx.druid.config;
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.common.config;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
@@ -8,7 +27,7 @@ import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.db.DbTablesConfig;
+import io.druid.db.DbTablesConfig;
 import org.joda.time.Duration;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
diff --git a/common/src/main/java/io/druid/common/config/ConfigManagerConfig.java b/common/src/main/java/io/druid/common/config/ConfigManagerConfig.java
new file mode 100644
index 00000000000..4e176501134
--- /dev/null
+++ b/common/src/main/java/io/druid/common/config/ConfigManagerConfig.java
@@ -0,0 +1,39 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.common.config;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.joda.time.Period;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ */
+public class ConfigManagerConfig
+{
+  @JsonProperty
+  @NotNull
+  private Period pollDuration = new Period("PT1M");
+
+  public Period getPollDuration()
+  {
+    return pollDuration;
+  }
+}
diff --git a/common/src/main/java/io/druid/common/config/ConfigSerde.java b/common/src/main/java/io/druid/common/config/ConfigSerde.java
new file mode 100644
index 00000000000..a8115facdd7
--- /dev/null
+++ b/common/src/main/java/io/druid/common/config/ConfigSerde.java
@@ -0,0 +1,28 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.common.config;
+
+/**
+*/
+public interface ConfigSerde<T>
+{
+  public byte[] serialize(T obj);
+  public T deserialize(byte[] bytes);
+}
diff --git a/common/src/main/java/com/metamx/druid/config/JacksonConfigManager.java b/common/src/main/java/io/druid/common/config/JacksonConfigManager.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/config/JacksonConfigManager.java
rename to common/src/main/java/io/druid/common/config/JacksonConfigManager.java
index 13ed516fe62..d746a98d3a2 100644
--- a/common/src/main/java/com/metamx/druid/config/JacksonConfigManager.java
+++ b/common/src/main/java/io/druid/common/config/JacksonConfigManager.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.config;
+package io.druid.common.config;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java b/common/src/main/java/io/druid/common/guava/CombiningSequence.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/guava/CombiningSequence.java
rename to common/src/main/java/io/druid/common/guava/CombiningSequence.java
index eb89003523c..4212e6564cd 100644
--- a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java
+++ b/common/src/main/java/io/druid/common/guava/CombiningSequence.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import com.google.common.collect.Ordering;
 import com.metamx.common.guava.Accumulator;
diff --git a/common/src/main/java/com/metamx/druid/guava/DSuppliers.java b/common/src/main/java/io/druid/common/guava/DSuppliers.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/guava/DSuppliers.java
rename to common/src/main/java/io/druid/common/guava/DSuppliers.java
index ce0768afd6e..7920fe40e67 100644
--- a/common/src/main/java/com/metamx/druid/guava/DSuppliers.java
+++ b/common/src/main/java/io/druid/common/guava/DSuppliers.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import com.google.common.base.Supplier;
 
diff --git a/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java b/common/src/main/java/io/druid/common/guava/FileOutputSupplier.java
similarity index 94%
rename from common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java
rename to common/src/main/java/io/druid/common/guava/FileOutputSupplier.java
index f9d713dd1b1..51054b34552 100644
--- a/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java
+++ b/common/src/main/java/io/druid/common/guava/FileOutputSupplier.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import com.google.common.io.OutputSupplier;
 
diff --git a/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java b/common/src/main/java/io/druid/common/guava/GuavaUtils.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/guava/GuavaUtils.java
rename to common/src/main/java/io/druid/common/guava/GuavaUtils.java
index 784bd06192c..4b5ff4cf911 100644
--- a/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java
+++ b/common/src/main/java/io/druid/common/guava/GuavaUtils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Function;
diff --git a/common/src/main/java/com/metamx/druid/guava/Runnables.java b/common/src/main/java/io/druid/common/guava/Runnables.java
similarity index 93%
rename from common/src/main/java/com/metamx/druid/guava/Runnables.java
rename to common/src/main/java/io/druid/common/guava/Runnables.java
index 118d4938a9d..e855f4081a3 100644
--- a/common/src/main/java/com/metamx/druid/guava/Runnables.java
+++ b/common/src/main/java/io/druid/common/guava/Runnables.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/guava/ThreadRenamingCallable.java b/common/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
similarity index 94%
rename from common/src/main/java/com/metamx/druid/guava/ThreadRenamingCallable.java
rename to common/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
index 6e034bfc156..cde7f3bbe18 100644
--- a/common/src/main/java/com/metamx/druid/guava/ThreadRenamingCallable.java
+++ b/common/src/main/java/io/druid/common/guava/ThreadRenamingCallable.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import java.util.concurrent.Callable;
 
diff --git a/common/src/main/java/com/metamx/druid/guava/ThreadRenamingRunnable.java b/common/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
similarity index 93%
rename from common/src/main/java/com/metamx/druid/guava/ThreadRenamingRunnable.java
rename to common/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
index 1175d6e795a..83ed0f39433 100644
--- a/common/src/main/java/com/metamx/druid/guava/ThreadRenamingRunnable.java
+++ b/common/src/main/java/io/druid/common/guava/ThreadRenamingRunnable.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/utils/CompressionUtils.java b/common/src/main/java/io/druid/common/utils/CompressionUtils.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/utils/CompressionUtils.java
rename to common/src/main/java/io/druid/common/utils/CompressionUtils.java
index 20d019a54ef..dcca115a982 100644
--- a/common/src/main/java/com/metamx/druid/utils/CompressionUtils.java
+++ b/common/src/main/java/io/druid/common/utils/CompressionUtils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.utils;
+package io.druid.common.utils;
 
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closeables;
diff --git a/common/src/main/java/com/metamx/druid/utils/JodaUtils.java b/common/src/main/java/io/druid/common/utils/JodaUtils.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/utils/JodaUtils.java
rename to common/src/main/java/io/druid/common/utils/JodaUtils.java
index 9368a8af111..b488f1e5a7d 100644
--- a/common/src/main/java/com/metamx/druid/utils/JodaUtils.java
+++ b/common/src/main/java/io/druid/common/utils/JodaUtils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.utils;
+package io.druid.common.utils;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
diff --git a/common/src/main/java/com/metamx/druid/utils/PropUtils.java b/common/src/main/java/io/druid/common/utils/PropUtils.java
similarity index 95%
rename from common/src/main/java/com/metamx/druid/utils/PropUtils.java
rename to common/src/main/java/io/druid/common/utils/PropUtils.java
index 48909c02efe..184f765a39f 100644
--- a/common/src/main/java/com/metamx/druid/utils/PropUtils.java
+++ b/common/src/main/java/io/druid/common/utils/PropUtils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.utils;
+package io.druid.common.utils;
 
 import com.metamx.common.ISE;
 
diff --git a/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java b/common/src/main/java/io/druid/common/utils/SerializerUtils.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/utils/SerializerUtils.java
rename to common/src/main/java/io/druid/common/utils/SerializerUtils.java
index 0a1b58d0383..28cdf7629a3 100644
--- a/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java
+++ b/common/src/main/java/io/druid/common/utils/SerializerUtils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.utils;
+package io.druid.common.utils;
 
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closeables;
 import com.google.common.io.OutputSupplier;
-import com.metamx.druid.IntList;
+import io.druid.collections.IntList;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/common/src/main/java/io/druid/common/utils/SocketUtil.java b/common/src/main/java/io/druid/common/utils/SocketUtil.java
new file mode 100644
index 00000000000..2a201d58b6f
--- /dev/null
+++ b/common/src/main/java/io/druid/common/utils/SocketUtil.java
@@ -0,0 +1,58 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.common.utils;
+
+import com.metamx.common.ISE;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+/**
+ */
+public class SocketUtil
+{
+  public static int findOpenPort(int startPort)
+  {
+    int currPort = startPort;
+
+    while (currPort < 0xffff) {
+      ServerSocket socket = null;
+      try {
+        socket = new ServerSocket(currPort);
+        return currPort;
+      }
+      catch (IOException e) {
+        ++currPort;
+      }
+      finally {
+        if (socket != null) {
+          try {
+            socket.close();
+          }
+          catch (IOException e) {
+
+          }
+        }
+      }
+    }
+
+    throw new ISE("Unable to find open port between[%d] and [%d]", startPort, currPort);
+  }
+}
diff --git a/common/src/main/java/com/metamx/druid/concurrent/Execs.java b/common/src/main/java/io/druid/concurrent/Execs.java
similarity index 95%
rename from common/src/main/java/com/metamx/druid/concurrent/Execs.java
rename to common/src/main/java/io/druid/concurrent/Execs.java
index 38ec4db6416..ea27bf96e05 100644
--- a/common/src/main/java/com/metamx/druid/concurrent/Execs.java
+++ b/common/src/main/java/io/druid/concurrent/Execs.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.concurrent;
+package io.druid.concurrent;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
diff --git a/common/src/main/java/com/metamx/druid/input/InputRow.java b/common/src/main/java/io/druid/data/input/InputRow.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/input/InputRow.java
rename to common/src/main/java/io/druid/data/input/InputRow.java
index c08965c340e..b0c8bdcbac3 100644
--- a/common/src/main/java/com/metamx/druid/input/InputRow.java
+++ b/common/src/main/java/io/druid/data/input/InputRow.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.input;
+package io.druid.data.input;
 
 import java.util.List;
 
diff --git a/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java b/common/src/main/java/io/druid/data/input/MapBasedInputRow.java
similarity index 94%
rename from common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java
rename to common/src/main/java/io/druid/data/input/MapBasedInputRow.java
index 2177bcde776..ae9b6b80118 100644
--- a/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java
+++ b/common/src/main/java/io/druid/data/input/MapBasedInputRow.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.input;
+package io.druid.data.input;
 
 import org.joda.time.DateTime;
 
diff --git a/common/src/main/java/com/metamx/druid/input/MapBasedRow.java b/common/src/main/java/io/druid/data/input/MapBasedRow.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/input/MapBasedRow.java
rename to common/src/main/java/io/druid/data/input/MapBasedRow.java
index 8612eb843b2..14af00a9a49 100644
--- a/common/src/main/java/com/metamx/druid/input/MapBasedRow.java
+++ b/common/src/main/java/io/druid/data/input/MapBasedRow.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.input;
+package io.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.metamx.common.IAE;
 import com.metamx.common.exception.FormattedException;
-
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;
diff --git a/common/src/main/java/com/metamx/druid/input/Row.java b/common/src/main/java/io/druid/data/input/Row.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/input/Row.java
rename to common/src/main/java/io/druid/data/input/Row.java
index 613c614cb45..e30b1103c13 100644
--- a/common/src/main/java/com/metamx/druid/input/Row.java
+++ b/common/src/main/java/io/druid/data/input/Row.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.input;
+package io.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/common/src/main/java/com/metamx/druid/input/Rows.java b/common/src/main/java/io/druid/data/input/Rows.java
similarity index 94%
rename from common/src/main/java/com/metamx/druid/input/Rows.java
rename to common/src/main/java/io/druid/data/input/Rows.java
index 7ad4762981a..e48352aad8a 100644
--- a/common/src/main/java/com/metamx/druid/input/Rows.java
+++ b/common/src/main/java/io/druid/data/input/Rows.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.input;
+package io.druid.data.input;
 
 import com.google.common.collect.Maps;
 import com.metamx.common.ISE;
diff --git a/common/src/main/java/com/metamx/druid/db/DbConnector.java b/common/src/main/java/io/druid/db/DbConnector.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/db/DbConnector.java
rename to common/src/main/java/io/druid/db/DbConnector.java
index 1bf74de36b7..6459735528c 100644
--- a/common/src/main/java/com/metamx/druid/db/DbConnector.java
+++ b/common/src/main/java/io/druid/db/DbConnector.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.db;
+package io.druid.db;
 
 import com.google.common.base.Supplier;
 import com.google.inject.Inject;
diff --git a/common/src/main/java/com/metamx/druid/db/DbConnectorConfig.java b/common/src/main/java/io/druid/db/DbConnectorConfig.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/db/DbConnectorConfig.java
rename to common/src/main/java/io/druid/db/DbConnectorConfig.java
index 074551541d0..9a1c30401e6 100644
--- a/common/src/main/java/com/metamx/druid/db/DbConnectorConfig.java
+++ b/common/src/main/java/io/druid/db/DbConnectorConfig.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.db;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/common/src/main/java/com/metamx/druid/db/DbTablesConfig.java b/common/src/main/java/io/druid/db/DbTablesConfig.java
similarity index 73%
rename from common/src/main/java/com/metamx/druid/db/DbTablesConfig.java
rename to common/src/main/java/io/druid/db/DbTablesConfig.java
index 2a4282a9cc9..511648f0c3e 100644
--- a/common/src/main/java/com/metamx/druid/db/DbTablesConfig.java
+++ b/common/src/main/java/io/druid/db/DbTablesConfig.java
@@ -1,4 +1,23 @@
-package com.metamx.druid.db;
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/common/src/main/java/io/druid/guice/guice/DbConnectorModule.java b/common/src/main/java/io/druid/guice/guice/DbConnectorModule.java
index 1daf09c4f73..4c9f43f92de 100644
--- a/common/src/main/java/io/druid/guice/guice/DbConnectorModule.java
+++ b/common/src/main/java/io/druid/guice/guice/DbConnectorModule.java
@@ -22,9 +22,9 @@ package io.druid.guice.guice;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
-import com.metamx.druid.db.DbConnector;
-import com.metamx.druid.db.DbConnectorConfig;
-import com.metamx.druid.db.DbTablesConfig;
+import io.druid.db.DbConnector;
+import io.druid.db.DbConnectorConfig;
+import io.druid.db.DbTablesConfig;
 import org.skife.jdbi.v2.IDBI;
 
 /**
diff --git a/common/src/main/java/io/druid/guice/guice/JacksonConfigManagerModule.java b/common/src/main/java/io/druid/guice/guice/JacksonConfigManagerModule.java
index 4edb08b40e9..c82dd998742 100644
--- a/common/src/main/java/io/druid/guice/guice/JacksonConfigManagerModule.java
+++ b/common/src/main/java/io/druid/guice/guice/JacksonConfigManagerModule.java
@@ -24,11 +24,11 @@ import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.metamx.common.lifecycle.Lifecycle;
-import com.metamx.druid.config.ConfigManager;
-import com.metamx.druid.config.ConfigManagerConfig;
-import com.metamx.druid.config.JacksonConfigManager;
-import com.metamx.druid.db.DbConnector;
-import com.metamx.druid.db.DbTablesConfig;
+import io.druid.common.config.ConfigManager;
+import io.druid.common.config.ConfigManagerConfig;
+import io.druid.common.config.JacksonConfigManager;
+import io.druid.db.DbConnector;
+import io.druid.db.DbTablesConfig;
 
 /**
  */
diff --git a/common/src/main/java/io/druid/guice/guice/JacksonConfigProvider.java b/common/src/main/java/io/druid/guice/guice/JacksonConfigProvider.java
index b48ff8aee50..51ab93057dc 100644
--- a/common/src/main/java/io/druid/guice/guice/JacksonConfigProvider.java
+++ b/common/src/main/java/io/druid/guice/guice/JacksonConfigProvider.java
@@ -26,8 +26,8 @@ import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.util.Types;
-import com.metamx.druid.config.JacksonConfigManager;
-import com.metamx.druid.guava.DSuppliers;
+import io.druid.common.config.JacksonConfigManager;
+import io.druid.common.guava.DSuppliers;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/LogicalSegment.java b/common/src/main/java/io/druid/timeline/LogicalSegment.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/LogicalSegment.java
rename to common/src/main/java/io/druid/timeline/LogicalSegment.java
index 70f89ec0b6d..ffd611a02bb 100644
--- a/common/src/main/java/com/metamx/druid/LogicalSegment.java
+++ b/common/src/main/java/io/druid/timeline/LogicalSegment.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.timeline;
 
 import org.joda.time.Interval;
 
diff --git a/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java b/common/src/main/java/io/druid/timeline/TimelineObjectHolder.java
similarity index 95%
rename from common/src/main/java/com/metamx/druid/TimelineObjectHolder.java
rename to common/src/main/java/io/druid/timeline/TimelineObjectHolder.java
index defb0c128f1..83244cd394c 100644
--- a/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java
+++ b/common/src/main/java/io/druid/timeline/TimelineObjectHolder.java
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.timeline;
 
-import com.metamx.druid.partition.PartitionHolder;
+import io.druid.timeline.partition.PartitionHolder;
 import org.joda.time.Interval;
 
 /**
diff --git a/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java b/common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java
rename to common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
index fcbdfc6502b..6674648d3a3 100644
--- a/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java
+++ b/common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,15 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.timeline;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.metamx.common.guava.Comparators;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.partition.ImmutablePartitionHolder;
-import com.metamx.druid.partition.PartitionChunk;
-import com.metamx.druid.partition.PartitionHolder;
+import io.druid.timeline.partition.ImmutablePartitionHolder;
+import io.druid.timeline.partition.PartitionChunk;
+import io.druid.timeline.partition.PartitionHolder;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
diff --git a/common/src/main/java/com/metamx/druid/partition/ImmutablePartitionHolder.java b/common/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
similarity index 93%
rename from common/src/main/java/com/metamx/druid/partition/ImmutablePartitionHolder.java
rename to common/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
index 63cccd99825..08beb79e316 100644
--- a/common/src/main/java/com/metamx/druid/partition/ImmutablePartitionHolder.java
+++ b/common/src/main/java/io/druid/timeline/partition/ImmutablePartitionHolder.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
index b74de9e36a8..6e4d7d24666 100644
--- a/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/IntegerPartitionChunk.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import com.google.common.collect.Ordering;
 
diff --git a/common/src/main/java/com/metamx/druid/partition/LinearPartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
similarity index 66%
rename from common/src/main/java/com/metamx/druid/partition/LinearPartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
index cbc299f820e..1494c37627f 100644
--- a/common/src/main/java/com/metamx/druid/partition/LinearPartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/LinearPartitionChunk.java
@@ -1,4 +1,23 @@
-package com.metamx.druid.partition;
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.timeline.partition;
 
 import com.google.common.collect.Ordering;
 
diff --git a/common/src/main/java/com/metamx/druid/partition/NumberedPartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/partition/NumberedPartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
index ac4156dfa67..8fb3e2bd69b 100644
--- a/common/src/main/java/com/metamx/druid/partition/NumberedPartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/NumberedPartitionChunk.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
diff --git a/common/src/main/java/com/metamx/druid/partition/PartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/PartitionChunk.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/partition/PartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/PartitionChunk.java
index 78d077f7a02..5907b673d5b 100644
--- a/common/src/main/java/com/metamx/druid/partition/PartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/PartitionChunk.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 /**
  * A PartitionChunk represents a chunk of a partitioned(sharded) space.  It has knowledge of whether it is
diff --git a/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java b/common/src/main/java/io/druid/timeline/partition/PartitionHolder.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/partition/PartitionHolder.java
rename to common/src/main/java/io/druid/timeline/partition/PartitionHolder.java
index be40ce9a63e..fb0902142f4 100644
--- a/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java
+++ b/common/src/main/java/io/druid/timeline/partition/PartitionHolder.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
diff --git a/common/src/main/java/com/metamx/druid/partition/SingleElementPartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/partition/SingleElementPartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
index 19f856e6b65..ab5f96fb22a 100644
--- a/common/src/main/java/com/metamx/druid/partition/SingleElementPartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/SingleElementPartitionChunk.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java b/common/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
similarity index 97%
rename from common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java
rename to common/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
index 54b067faf7d..bbee1877bf6 100644
--- a/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java
+++ b/common/src/main/java/io/druid/timeline/partition/StringPartitionChunk.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import com.google.common.collect.Ordering;
 
diff --git a/common/src/test/java/com/metamx/druid/IntListTest.java b/common/src/test/java/io/druid/collections/IntListTest.java
similarity index 95%
rename from common/src/test/java/com/metamx/druid/IntListTest.java
rename to common/src/test/java/io/druid/collections/IntListTest.java
index 2d39a3269f1..1c97a43d876 100644
--- a/common/src/test/java/com/metamx/druid/IntListTest.java
+++ b/common/src/test/java/io/druid/collections/IntListTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.collections;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/com/metamx/druid/collect/IteratorShell.java b/common/src/test/java/io/druid/collections/IteratorShell.java
similarity index 93%
rename from common/src/test/java/com/metamx/druid/collect/IteratorShell.java
rename to common/src/test/java/io/druid/collections/IteratorShell.java
index 1e39d3b0629..c5109be1236 100644
--- a/common/src/test/java/com/metamx/druid/collect/IteratorShell.java
+++ b/common/src/test/java/io/druid/collections/IteratorShell.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import java.util.Iterator;
 
diff --git a/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java b/common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
similarity index 98%
rename from common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java
rename to common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
index f06b337e348..6793a2b1fe5 100644
--- a/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java
+++ b/common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
diff --git a/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java b/common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
similarity index 98%
rename from common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java
rename to common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
index 7080a50c73c..257043ca0d8 100644
--- a/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java
+++ b/common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.collect;
+package io.druid.collections;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
diff --git a/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java b/common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
similarity index 98%
rename from common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java
rename to common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
index 2fafcedc890..3b997f4cdcf 100644
--- a/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java
+++ b/common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.guava;
+package io.druid.common.guava;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
diff --git a/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java b/common/src/test/java/io/druid/common/utils/JodaUtilsTest.java
similarity index 97%
rename from common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java
rename to common/src/test/java/io/druid/common/utils/JodaUtilsTest.java
index f0248295dfd..2fe084c3a01 100644
--- a/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java
+++ b/common/src/test/java/io/druid/common/utils/JodaUtilsTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.utils;
+package io.druid.common.utils;
 
 import org.joda.time.Interval;
 import org.junit.Assert;
diff --git a/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java b/common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
similarity index 99%
rename from common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java
rename to common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
index 80068a6dd6e..864eda882ce 100644
--- a/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java
+++ b/common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,16 +17,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.timeline;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 import com.metamx.common.Pair;
-import com.metamx.druid.partition.ImmutablePartitionHolder;
-import com.metamx.druid.partition.IntegerPartitionChunk;
-import com.metamx.druid.partition.PartitionChunk;
-import com.metamx.druid.partition.PartitionHolder;
-import com.metamx.druid.partition.SingleElementPartitionChunk;
+import io.druid.timeline.partition.ImmutablePartitionHolder;
+import io.druid.timeline.partition.IntegerPartitionChunk;
+import io.druid.timeline.partition.PartitionChunk;
+import io.druid.timeline.partition.PartitionHolder;
+import io.druid.timeline.partition.SingleElementPartitionChunk;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
 import org.joda.time.Hours;
diff --git a/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java b/common/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
similarity index 94%
rename from common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java
rename to common/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
index f408f2b04cd..e4fd6bc765a 100644
--- a/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java
+++ b/common/src/test/java/io/druid/timeline/partition/IntegerPartitionChunkTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import static com.metamx.druid.partition.IntegerPartitionChunk.make;
+import static io.druid.timeline.partition.IntegerPartitionChunk.make;
 
 /**
  */
diff --git a/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java b/common/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
similarity index 94%
rename from common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java
rename to common/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
index 8a6cadf1743..0512cc51d36 100644
--- a/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java
+++ b/common/src/test/java/io/druid/timeline/partition/StringPartitionChunkTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.partition;
+package io.druid.timeline.partition;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import static com.metamx.druid.partition.StringPartitionChunk.make;
+import static io.druid.timeline.partition.StringPartitionChunk.make;
 
 /**
  */
diff --git a/examples/src/main/java/druid/examples/flights/FlightsConverter.java b/examples/src/main/java/druid/examples/flights/FlightsConverter.java
index 53ea6638e60..2edb012b62b 100644
--- a/examples/src/main/java/druid/examples/flights/FlightsConverter.java
+++ b/examples/src/main/java/druid/examples/flights/FlightsConverter.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@ package druid.examples.flights;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.Closeables;
 import com.metamx.common.parsers.CSVParser;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Period;
diff --git a/examples/src/main/java/druid/examples/flights/FlightsFirehoseFactory.java b/examples/src/main/java/druid/examples/flights/FlightsFirehoseFactory.java
index d008a4d0997..68ffbfbdb9a 100644
--- a/examples/src/main/java/druid/examples/flights/FlightsFirehoseFactory.java
+++ b/examples/src/main/java/druid/examples/flights/FlightsFirehoseFactory.java
@@ -25,9 +25,9 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterators;
 import com.google.common.io.Closeables;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 
 import java.io.BufferedReader;
diff --git a/examples/src/main/java/druid/examples/rand/RandomFirehoseFactory.java b/examples/src/main/java/druid/examples/rand/RandomFirehoseFactory.java
index 71a0c1fbb92..8f930042622 100644
--- a/examples/src/main/java/druid/examples/rand/RandomFirehoseFactory.java
+++ b/examples/src/main/java/druid/examples/rand/RandomFirehoseFactory.java
@@ -1,3 +1,22 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package druid.examples.rand;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -5,10 +24,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.collect.Maps;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedInputRow;
 
 import java.io.IOException;
 import java.util.LinkedList;
diff --git a/examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java b/examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
index 36843522d13..05d37969a47 100644
--- a/examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
+++ b/examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
@@ -1,3 +1,22 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package druid.examples.twitter;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -5,10 +24,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.collect.Lists;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedInputRow;
 import twitter4j.ConnectionLifeCycleListener;
 import twitter4j.HashtagEntity;
 import twitter4j.StallWarning;
diff --git a/examples/src/main/java/druid/examples/web/InputSupplierUpdateStream.java b/examples/src/main/java/druid/examples/web/InputSupplierUpdateStream.java
index 40d7cf71616..4546d8cb2a9 100644
--- a/examples/src/main/java/druid/examples/web/InputSupplierUpdateStream.java
+++ b/examples/src/main/java/druid/examples/web/InputSupplierUpdateStream.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,8 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.InputSupplier;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.jackson.DefaultObjectMapper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/examples/src/main/java/druid/examples/web/WebFirehoseFactory.java b/examples/src/main/java/druid/examples/web/WebFirehoseFactory.java
index 885089a2001..1c2735bac45 100644
--- a/examples/src/main/java/druid/examples/web/WebFirehoseFactory.java
+++ b/examples/src/main/java/druid/examples/web/WebFirehoseFactory.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,12 +24,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Throwables;
 import com.metamx.common.parsers.TimestampParser;
-import com.metamx.druid.guava.Runnables;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.common.guava.Runnables;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedInputRow;
 import org.joda.time.DateTime;
 
 import java.io.IOException;
diff --git a/examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java b/examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java
index 755bcfd197a..64df05d731e 100644
--- a/examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java
+++ b/examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,8 +21,8 @@ package druid.examples.web;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
+import io.druid.data.input.InputRow;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
index d9a07be08e9..924285e86c1 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
@@ -22,9 +22,9 @@ package com.metamx.druid.indexer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.db.DbConnector;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.DataSegment;
+import io.druid.db.DbConnector;
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java
index e1e9b509f49..e28132f9e44 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java
@@ -38,8 +38,8 @@ import com.google.common.io.Closeables;
 import com.metamx.common.ISE;
 import com.metamx.common.guava.nary.BinaryFn;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.CombiningIterable;
-import com.metamx.druid.input.InputRow;
+import io.druid.collections.CombiningIterable;
+import io.druid.data.input.InputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.server.shard.shard.NoneShardSpec;
 import io.druid.server.shard.shard.ShardSpec;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
index fd2b86b1b3c..aa7553cfa5a 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
@@ -44,14 +44,14 @@ import com.metamx.druid.indexer.partitions.PartitionsSpec;
 import com.metamx.druid.indexer.path.PathSpec;
 import com.metamx.druid.indexer.rollup.DataRollupSpec;
 import com.metamx.druid.indexer.updater.DbUpdaterJobSpec;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-import com.metamx.druid.utils.JodaUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.JodaUtils;
 import io.druid.data.input.DataSpec;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 import io.druid.data.input.TimestampSpec;
 import io.druid.data.input.ToLowercaseDataSpec;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.serde.Registererer;
 import io.druid.segment.serde.Registererers;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java
index c40572e9b3f..df747a2568c 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java
@@ -20,7 +20,7 @@
 package com.metamx.druid.indexer;
 
 import com.metamx.common.RE;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
index dc3337be0b6..f249801571f 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
@@ -33,8 +33,8 @@ import com.metamx.common.IAE;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
 import com.metamx.druid.indexer.rollup.DataRollupSpec;
-import com.metamx.druid.input.InputRow;
 import io.druid.client.DataSegment;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.IndexIO;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java
index 10c989f10a0..13726f6d8cd 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterators;
 import com.metamx.common.ISE;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.compress.CompressionCodec;
diff --git a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java
index 3d0a85c310b..bebc983e558 100644
--- a/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java
+++ b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@ package com.metamx.druid.indexer.updater;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Supplier;
-import com.metamx.druid.db.DbConnectorConfig;
+import io.druid.db.DbConnectorConfig;
 
 /**
  */
diff --git a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
index 831ac9b43f9..af95fb07fe7 100644
--- a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
+++ b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,11 +22,11 @@ package com.metamx.druid.indexer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
-import com.metamx.druid.db.DbConnectorConfig;
 import com.metamx.druid.indexer.granularity.UniformGranularitySpec;
 import com.metamx.druid.indexer.partitions.PartitionsSpec;
 import com.metamx.druid.indexer.updater.DbUpdaterJobSpec;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.db.DbConnectorConfig;
+import io.druid.jackson.DefaultObjectMapper;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
diff --git a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java
index ecf6918b289..dce1da59602 100644
--- a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java
+++ b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,8 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.junit.Assert;
diff --git a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java
index ea29d5ae727..713a49e013d 100644
--- a/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java
+++ b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,7 @@ import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.metamx.common.Granularity;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.junit.Assert;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/EventReceiverFirehoseFactory.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/EventReceiverFirehoseFactory.java
index 7d76423be4d..d05db9b3ba4 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/EventReceiverFirehoseFactory.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/EventReceiverFirehoseFactory.java
@@ -28,10 +28,10 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.MapInputRowParser;
 
 import javax.ws.rs.POST;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/StaticS3FirehoseFactory.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/StaticS3FirehoseFactory.java
index d72586b2ec1..18cfcf3a0eb 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/StaticS3FirehoseFactory.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/index/StaticS3FirehoseFactory.java
@@ -29,9 +29,9 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/AppendTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/AppendTask.java
index 85e66909f1f..a6d1a54f7ba 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/AppendTask.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/AppendTask.java
@@ -26,8 +26,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
 import io.druid.client.DataSegment;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMerger;
@@ -35,6 +33,8 @@ import io.druid.segment.IndexableAdapter;
 import io.druid.segment.QueryableIndexIndexableAdapter;
 import io.druid.segment.Rowboat;
 import io.druid.segment.RowboatFilteringIndexAdapter;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/HadoopIndexTask.java
index 70fb3044d4c..b7bca9b7fb5 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/HadoopIndexTask.java
@@ -34,8 +34,8 @@ import com.metamx.druid.indexing.common.TaskToolbox;
 import com.metamx.druid.indexing.common.actions.LockListAction;
 import com.metamx.druid.indexing.common.actions.SegmentInsertAction;
 import com.metamx.druid.loading.S3DataSegmentPusher;
-import com.metamx.druid.utils.JodaUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.JodaUtils;
 import org.joda.time.DateTime;
 
 import java.util.List;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexDeterminePartitionsTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexDeterminePartitionsTask.java
index de914657b72..101e0f6ff32 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexDeterminePartitionsTask.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexDeterminePartitionsTask.java
@@ -34,10 +34,10 @@ import com.metamx.common.logger.Logger;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.TaskToolbox;
 import com.metamx.druid.indexing.common.actions.SpawnTasksAction;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.Schema;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
+import io.druid.data.input.InputRow;
 import io.druid.server.shard.shard.NoneShardSpec;
 import io.druid.server.shard.shard.ShardSpec;
 import io.druid.server.shard.shard.SingleDimensionShardSpec;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexGeneratorTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexGeneratorTask.java
index 79f06a34f02..b2bb5fac53f 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexGeneratorTask.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexGeneratorTask.java
@@ -33,7 +33,6 @@ import com.metamx.druid.indexing.common.TaskToolbox;
 import com.metamx.druid.indexing.common.actions.LockListAction;
 import com.metamx.druid.indexing.common.actions.SegmentInsertAction;
 import com.metamx.druid.indexing.common.index.YeOldePlumberSchool;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.loading.DataSegmentPusher;
 import com.metamx.druid.realtime.FireDepartmentMetrics;
 import com.metamx.druid.realtime.Schema;
@@ -42,6 +41,7 @@ import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import com.metamx.druid.realtime.plumber.Plumber;
 import com.metamx.druid.realtime.plumber.Sink;
 import io.druid.client.DataSegment;
+import io.druid.data.input.InputRow;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
index 7078d5a5ece..111c58bf71a 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
@@ -34,7 +34,6 @@ import com.metamx.druid.indexing.common.actions.LockAcquireAction;
 import com.metamx.druid.indexing.common.actions.LockListAction;
 import com.metamx.druid.indexing.common.actions.LockReleaseAction;
 import com.metamx.druid.indexing.common.actions.SegmentInsertAction;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.druid.realtime.FireDepartment;
 import com.metamx.druid.realtime.FireDepartmentConfig;
@@ -50,6 +49,7 @@ import com.metamx.druid.realtime.plumber.Sink;
 import com.metamx.druid.realtime.plumber.VersioningPolicy;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.client.DataSegment;
+import io.druid.data.input.InputRow;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/DbTaskStorage.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/DbTaskStorage.java
index c92257e1413..511302fd2f9 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/DbTaskStorage.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/DbTaskStorage.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,12 +29,12 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
-import com.metamx.druid.db.DbTablesConfig;
 import com.metamx.druid.indexing.common.TaskLock;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.actions.TaskAction;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.db.DbTablesConfig;
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/IndexerDBCoordinator.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/IndexerDBCoordinator.java
index f1e9c8dbde3..792e8f241b3 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/IndexerDBCoordinator.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/IndexerDBCoordinator.java
@@ -28,11 +28,11 @@ import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.db.DbConnectorConfig;
-import com.metamx.druid.db.DbTablesConfig;
 import io.druid.client.DataSegment;
+import io.druid.db.DbConnectorConfig;
+import io.druid.db.DbTablesConfig;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.skife.jdbi.v2.FoldController;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ThreadPoolTaskRunner.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ThreadPoolTaskRunner.java
index c9f12e715c7..96f52ceaa23 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ThreadPoolTaskRunner.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ThreadPoolTaskRunner.java
@@ -30,12 +30,12 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.inject.Inject;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.TaskToolbox;
 import com.metamx.druid.indexing.common.TaskToolboxFactory;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.concurrent.Execs;
 import io.druid.query.NoopQueryRunner;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/IndexerDbConnectorConfig.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/IndexerDbConnectorConfig.java
index 63fb4c4245a..777f2f3b301 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/IndexerDbConnectorConfig.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/IndexerDbConnectorConfig.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,8 +20,7 @@
 package com.metamx.druid.indexing.coordinator.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.db.DbConnectorConfig;
-
+import io.druid.db.DbConnectorConfig;
 import org.skife.config.Config;
 
 public abstract class IndexerDbConnectorConfig extends DbConnectorConfig
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorResource.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorResource.java
index 2d47f603486..0def32177ea 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorResource.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorResource.java
@@ -29,7 +29,6 @@ import com.google.common.collect.Maps;
 import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.config.JacksonConfigManager;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.actions.TaskActionClient;
 import com.metamx.druid.indexing.common.actions.TaskActionHolder;
@@ -43,6 +42,7 @@ import com.metamx.druid.indexing.coordinator.TaskStorageQueryAdapter;
 import com.metamx.druid.indexing.coordinator.scaling.ResourceManagementScheduler;
 import com.metamx.druid.indexing.coordinator.setup.WorkerSetupData;
 import io.druid.client.DataSegment;
+import io.druid.common.config.JacksonConfigManager;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/OldIndexerCoordinatorResource.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/OldIndexerCoordinatorResource.java
index fe91431c163..e5ac8f0c42b 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/OldIndexerCoordinatorResource.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/OldIndexerCoordinatorResource.java
@@ -1,11 +1,30 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.indexing.coordinator.http;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
-import com.metamx.druid.config.JacksonConfigManager;
 import com.metamx.druid.indexing.common.tasklogs.TaskLogStreamer;
 import com.metamx.druid.indexing.coordinator.TaskMaster;
 import com.metamx.druid.indexing.coordinator.TaskStorageQueryAdapter;
+import io.druid.common.config.JacksonConfigManager;
 
 import javax.ws.rs.Path;
 
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerTaskMonitor.java b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerTaskMonitor.java
index d4bc2f9a3c5..d877d4db494 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerTaskMonitor.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerTaskMonitor.java
@@ -23,12 +23,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.druid.indexing.coordinator.TaskRunner;
 import com.metamx.druid.indexing.worker.config.WorkerConfig;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.concurrent.Execs;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorLifecycle.java
index 4e998825656..e696f77f25e 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorLifecycle.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorLifecycle.java
@@ -1,3 +1,22 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.indexing.worker.executor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,11 +27,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.Inject;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.druid.indexing.coordinator.TaskRunner;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.concurrent.Execs;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/TaskSerdeTest.java
index 34cd943c5ca..acd46f84aa9 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/TaskSerdeTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/TaskSerdeTest.java
@@ -27,14 +27,14 @@ import com.metamx.druid.indexer.HadoopDruidIndexerConfig;
 import com.metamx.druid.indexer.granularity.UniformGranularitySpec;
 import com.metamx.druid.indexer.path.StaticPathSpec;
 import com.metamx.druid.indexer.rollup.DataRollupSpec;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.realtime.Schema;
 import io.druid.client.DataSegment;
 import io.druid.data.input.JSONDataSpec;
 import io.druid.granularity.QueryGranularity;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.segment.IndexGranularity;
 import io.druid.server.shard.shard.NoneShardSpec;
 import junit.framework.Assert;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/VersionConverterTaskTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/VersionConverterTaskTest.java
index 83bb3334f25..a7551f0d657 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/VersionConverterTaskTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/common/task/VersionConverterTaskTest.java
@@ -21,8 +21,8 @@ package com.metamx.druid.indexing.common.task;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.DataSegment;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.server.shard.shard.NoneShardSpec;
 import junit.framework.Assert;
 import org.joda.time.DateTime;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
index 0abd75621d4..d4788346a1b 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.metamx.common.ISE;
-import com.metamx.druid.guava.DSuppliers;
 import com.metamx.druid.indexing.TestTask;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.TaskToolboxFactory;
@@ -43,12 +42,13 @@ import com.metamx.druid.indexing.worker.Worker;
 import com.metamx.druid.indexing.worker.WorkerCuratorCoordinator;
 import com.metamx.druid.indexing.worker.WorkerTaskMonitor;
 import com.metamx.druid.indexing.worker.config.WorkerConfig;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.emitter.EmittingLogger;
 import com.metamx.emitter.service.ServiceEmitter;
 import io.druid.client.DataSegment;
+import io.druid.common.guava.DSuppliers;
 import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.cache.SimplePathChildrenCacheFactory;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.server.initialization.initialization.ZkPathsConfig;
 import org.apache.curator.framework.CuratorFramework;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
index b27e08748fe..a13ab1280d9 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
@@ -48,9 +48,6 @@ import com.metamx.druid.indexing.common.task.KillTask;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.druid.indexing.common.task.TaskResource;
 import com.metamx.druid.indexing.coordinator.exec.TaskConsumer;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.loading.DataSegmentKiller;
 import com.metamx.druid.loading.DataSegmentPusher;
 import com.metamx.druid.loading.SegmentLoadingException;
@@ -61,9 +58,12 @@ import com.metamx.emitter.core.Event;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceEventBuilder;
 import io.druid.client.DataSegment;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedInputRow;
 import io.druid.granularity.QueryGranularity;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import org.apache.commons.io.FileUtils;
 import org.easymock.EasyMock;
 import org.joda.time.DateTime;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategyTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategyTest.java
index 39df4467800..4cdd4c586db 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategyTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategyTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,11 +28,11 @@ import com.amazonaws.services.ec2.model.RunInstancesRequest;
 import com.amazonaws.services.ec2.model.RunInstancesResult;
 import com.amazonaws.services.ec2.model.TerminateInstancesRequest;
 import com.google.common.collect.Lists;
-import com.metamx.druid.guava.DSuppliers;
 import com.metamx.druid.indexing.coordinator.setup.EC2NodeData;
 import com.metamx.druid.indexing.coordinator.setup.GalaxyUserData;
 import com.metamx.druid.indexing.coordinator.setup.WorkerSetupData;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.common.guava.DSuppliers;
+import io.druid.jackson.DefaultObjectMapper;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategyTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategyTest.java
index a255267762d..db1ec37e2c4 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategyTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategyTest.java
@@ -22,7 +22,6 @@ package com.metamx.druid.indexing.coordinator.scaling;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.metamx.druid.guava.DSuppliers;
 import com.metamx.druid.indexing.TestTask;
 import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.task.Task;
@@ -31,11 +30,12 @@ import com.metamx.druid.indexing.coordinator.ZkWorker;
 import com.metamx.druid.indexing.coordinator.setup.WorkerSetupData;
 import com.metamx.druid.indexing.worker.TaskAnnouncement;
 import com.metamx.druid.indexing.worker.Worker;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.emitter.EmittingLogger;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceEventBuilder;
 import io.druid.client.DataSegment;
+import io.druid.common.guava.DSuppliers;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
 import junit.framework.Assert;
 import org.easymock.EasyMock;
diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/worker/TaskAnnouncementTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/worker/TaskAnnouncementTest.java
index 9673b649ce6..ed439fc9486 100644
--- a/indexing-service/src/test/java/com/metamx/druid/indexing/worker/TaskAnnouncementTest.java
+++ b/indexing-service/src/test/java/com/metamx/druid/indexing/worker/TaskAnnouncementTest.java
@@ -24,9 +24,9 @@ import com.metamx.druid.indexing.common.TaskStatus;
 import com.metamx.druid.indexing.common.task.RealtimeIndexTask;
 import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.druid.indexing.common.task.TaskResource;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.realtime.Schema;
 import io.druid.granularity.QueryGranularity;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.IndexGranularity;
 import io.druid.server.shard.shard.NoneShardSpec;
diff --git a/processing/pom.xml b/processing/pom.xml
index 457fbac10ef..dbca7dfc46f 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -41,6 +41,15 @@
             <groupId>com.metamx</groupId>
             <artifactId>java-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.metamx</groupId>
+            <artifactId>bytebuffer-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.metamx</groupId>
+            <artifactId>emitter</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>com.ning</groupId>
diff --git a/processing/src/main/java/io/druid/data/input/InputRowParser.java b/processing/src/main/java/io/druid/data/input/InputRowParser.java
index d4159437cee..ea1a0dfa8a0 100644
--- a/processing/src/main/java/io/druid/data/input/InputRowParser.java
+++ b/processing/src/main/java/io/druid/data/input/InputRowParser.java
@@ -20,7 +20,6 @@
 package io.druid.data.input;
 
 import com.metamx.common.exception.FormattedException;
-import com.metamx.druid.input.InputRow;
 
 public interface InputRowParser<T>
 {
diff --git a/processing/src/main/java/io/druid/data/input/MapInputRowParser.java b/processing/src/main/java/io/druid/data/input/MapInputRowParser.java
index a152f3acd59..adb4cc534e5 100644
--- a/processing/src/main/java/io/druid/data/input/MapInputRowParser.java
+++ b/processing/src/main/java/io/druid/data/input/MapInputRowParser.java
@@ -25,8 +25,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.metamx.common.exception.FormattedException;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
 import org.joda.time.DateTime;
 
 import java.util.List;
diff --git a/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java b/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
index ec5d33362a5..f1f8ea875f5 100644
--- a/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
+++ b/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
@@ -29,7 +29,6 @@ import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.metamx.common.exception.FormattedException;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/data/input/StringInputRowParser.java b/processing/src/main/java/io/druid/data/input/StringInputRowParser.java
index 28b9bff649f..f2d9b10df07 100644
--- a/processing/src/main/java/io/druid/data/input/StringInputRowParser.java
+++ b/processing/src/main/java/io/druid/data/input/StringInputRowParser.java
@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList;
 import com.metamx.common.exception.FormattedException;
 import com.metamx.common.parsers.Parser;
 import com.metamx.common.parsers.ToLowerCaseParser;
-import com.metamx.druid.input.InputRow;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/common/src/main/java/com/metamx/druid/jackson/AggregatorsModule.java b/processing/src/main/java/io/druid/jackson/AggregatorsModule.java
similarity index 76%
rename from common/src/main/java/com/metamx/druid/jackson/AggregatorsModule.java
rename to processing/src/main/java/io/druid/jackson/AggregatorsModule.java
index 506dbf5130c..8ab41053c30 100644
--- a/common/src/main/java/com/metamx/druid/jackson/AggregatorsModule.java
+++ b/processing/src/main/java/io/druid/jackson/AggregatorsModule.java
@@ -17,23 +17,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.druid.query.aggregation.AggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.HistogramAggregatorFactory;
+import io.druid.query.aggregation.JavaScriptAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.MaxAggregatorFactory;
+import io.druid.query.aggregation.MinAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.HistogramAggregatorFactory;
-import io.druid.query.aggregation.aggregation.JavaScriptAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MaxAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MinAggregatorFactory;
-import io.druid.query.aggregation.aggregation.post.ArithmeticPostAggregator;
-import io.druid.query.aggregation.aggregation.post.ConstantPostAggregator;
-import io.druid.query.aggregation.aggregation.post.FieldAccessPostAggregator;
+import io.druid.query.aggregation.post.ArithmeticPostAggregator;
+import io.druid.query.aggregation.post.ConstantPostAggregator;
+import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java b/processing/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
similarity index 94%
rename from common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java
rename to processing/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
index c9cde097767..cd8910f28a1 100644
--- a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java
+++ b/processing/src/main/java/io/druid/jackson/CommaListJoinDeserializer.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java b/processing/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
similarity index 95%
rename from common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java
rename to processing/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
index ab66839524e..3a07a7d0432 100644
--- a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java
+++ b/processing/src/main/java/io/druid/jackson/CommaListJoinSerializer.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java b/processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java
rename to processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java
index 7f5f37262f3..6a320a1209a 100644
--- a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java
+++ b/processing/src/main/java/io/druid/jackson/DefaultObjectMapper.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/common/src/main/java/com/metamx/druid/jackson/DruidDefaultSerializersModule.java b/processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java
similarity index 99%
rename from common/src/main/java/com/metamx/druid/jackson/DruidDefaultSerializersModule.java
rename to processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java
index 04add157247..38c3bc135ef 100644
--- a/common/src/main/java/com/metamx/druid/jackson/DruidDefaultSerializersModule.java
+++ b/processing/src/main/java/io/druid/jackson/DruidDefaultSerializersModule.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/common/src/main/java/com/metamx/druid/jackson/JacksonModule.java b/processing/src/main/java/io/druid/jackson/JacksonModule.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/jackson/JacksonModule.java
rename to processing/src/main/java/io/druid/jackson/JacksonModule.java
index 73ee342b92c..e8808ad2ada 100644
--- a/common/src/main/java/com/metamx/druid/jackson/JacksonModule.java
+++ b/processing/src/main/java/io/druid/jackson/JacksonModule.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
diff --git a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java b/processing/src/main/java/io/druid/jackson/JodaStuff.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/jackson/JodaStuff.java
rename to processing/src/main/java/io/druid/jackson/JodaStuff.java
index 321daa9bb78..30b57d32039 100644
--- a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java
+++ b/processing/src/main/java/io/druid/jackson/JodaStuff.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/common/src/main/java/com/metamx/druid/jackson/QueryGranularityModule.java b/processing/src/main/java/io/druid/jackson/QueryGranularityModule.java
similarity index 98%
rename from common/src/main/java/com/metamx/druid/jackson/QueryGranularityModule.java
rename to processing/src/main/java/io/druid/jackson/QueryGranularityModule.java
index d40ca57c497..4417e6e268f 100644
--- a/common/src/main/java/com/metamx/druid/jackson/QueryGranularityModule.java
+++ b/processing/src/main/java/io/druid/jackson/QueryGranularityModule.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
diff --git a/processing/src/main/java/io/druid/query/QueryToolChest.java b/processing/src/main/java/io/druid/query/QueryToolChest.java
index 3d4726bc434..304d3e1eb14 100644
--- a/processing/src/main/java/io/druid/query/QueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/QueryToolChest.java
@@ -22,9 +22,9 @@ package io.druid.query;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.metamx.common.guava.Sequence;
-import com.metamx.druid.LogicalSegment;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.query.aggregation.MetricManipulationFn;
+import io.druid.timeline.LogicalSegment;
 
 import java.util.List;
 
diff --git a/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java b/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java
index f1ba9185fe8..94b670444e8 100644
--- a/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java
@@ -22,7 +22,7 @@ package io.druid.query;
 import com.google.common.collect.Ordering;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.druid.guava.CombiningSequence;
+import io.druid.common.guava.CombiningSequence;
 
 /**
  */
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregator.java b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/CountAggregator.java
index 65091226992..ca934ffad05 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
-
-import io.druid.query.aggregation.Aggregator;
+package io.druid.query.aggregation;
 
 import java.util.Comparator;
 
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java
similarity index 93%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java
index c5d67db8012..d0a791f6256 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/CountAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java
@@ -17,16 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/CountBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java
similarity index 93%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/CountBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java
index 3a9966660b7..b4179f475f0 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/CountBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/CountBufferAggregator.java
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
-
-import io.druid.query.aggregation.BufferAggregator;
+package io.druid.query.aggregation;
 
 import java.nio.ByteBuffer;
 
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
index 7cc8d9181ab..bde2d87cdcd 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
@@ -17,11 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Doubles;
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java
index 4dbda6ad359..4f75c4e906b 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java
index 2d1689b0ba0..36fa06b2034 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/DoubleSumBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumBufferAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/Histogram.java b/processing/src/main/java/io/druid/query/aggregation/Histogram.java
similarity index 99%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/Histogram.java
rename to processing/src/main/java/io/druid/query/aggregation/Histogram.java
index 40880b97230..b46c02bdc7d 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/Histogram.java
+++ b/processing/src/main/java/io/druid/query/aggregation/Histogram.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.base.Preconditions;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
index bbb73a4fc96..cc1ea5a81d4 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
similarity index 96%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
index 7901228df72..abea8794ad2 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,9 +26,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 import org.apache.commons.codec.binary.Base64;
 
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java
similarity index 96%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/HistogramBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java
index 8404c6e054f..131a182c1bf 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java
@@ -17,11 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramVisual.java b/processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java
similarity index 98%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/HistogramVisual.java
rename to processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java
index e81d42686fa..cfe7e050fe8 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/HistogramVisual.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramVisual.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregator.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java
index e97e1da5d02..13de35adefd 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.collect.Lists;
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.ObjectMetricSelector;
 
 import java.util.List;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
similarity index 97%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
index e2b72b40cf0..7779f4b5531 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,9 +26,6 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Doubles;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 import io.druid.segment.ObjectMetricSelector;
 import org.mozilla.javascript.Context;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java
index 880b12d6cbb..c497d3aef83 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/JavaScriptBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptBufferAggregator.java
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.collect.Lists;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.ObjectMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
index 1e1c4932d35..fdf19e98fa2 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java
index e653e45ebba..ca92f8eaf65 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Longs;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/LongSumBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
index 854a3affe42..89b40a6aef4 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/LongSumBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/MaxAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/MaxAggregator.java
index 273af8980e0..a3a8612d0ba 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MaxAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java
index 5ccac95330b..144b08f22b8 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/MaxBufferAggregator.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MaxBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/MaxBufferAggregator.java
index c51767c6002..8627a263662 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MaxBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MaxBufferAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/MinAggregator.java
similarity index 95%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/MinAggregator.java
index 3d2f8c2bc92..9910b9230d7 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MinAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.Aggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java
index 00ab840bd7e..9d0d3f15c58 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MinAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/MinBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/MinBufferAggregator.java
similarity index 94%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/MinBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/MinBufferAggregator.java
index b77f9d5f8f5..5be2c2e5add 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/MinBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MinBufferAggregator.java
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.FloatMetricSelector;
 
 import java.nio.ByteBuffer;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/NoopAggregator.java b/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java
similarity index 93%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/NoopAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java
index 8f778ff7c0e..7e2fc7ed5e5 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/NoopAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
-
-import io.druid.query.aggregation.Aggregator;
+package io.druid.query.aggregation;
 
 /**
  */
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/NoopBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java
similarity index 92%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/NoopBufferAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java
index 931863dc26a..7ff2d7cab2c 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/NoopBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/NoopBufferAggregator.java
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
-
-import io.druid.query.aggregation.BufferAggregator;
+package io.druid.query.aggregation;
 
 import java.nio.ByteBuffer;
 
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/ToLowerCaseAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/ToLowerCaseAggregatorFactory.java
similarity index 93%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/ToLowerCaseAggregatorFactory.java
rename to processing/src/main/java/io/druid/query/aggregation/ToLowerCaseAggregatorFactory.java
index 06cd02deb53..6d78cd87ad5 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/ToLowerCaseAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/ToLowerCaseAggregatorFactory.java
@@ -17,11 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.MetricSelectorFactory;
 
 import java.util.Comparator;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregator.java b/processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java
similarity index 98%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java
index 8f449e23a85..cf6881d18ad 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/post/ArithmeticPostAggregator.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregator.java b/processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java
similarity index 97%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java
index 85cb3bf67f0..d5dce4d3140 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/post/ConstantPostAggregator.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/common/src/main/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregator.java b/processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java
similarity index 97%
rename from common/src/main/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregator.java
rename to processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java
index c33b63959cd..59962836d2e 100644
--- a/common/src/main/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/post/FieldAccessPostAggregator.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java
index bd75455bb02..93db02101ba 100644
--- a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java
+++ b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java
@@ -30,7 +30,7 @@ import com.google.common.collect.Lists;
 import com.metamx.common.ISE;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.BaseQuery;
 import io.druid.query.Queries;
diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
index 030bd20e7fd..40a0203de83 100644
--- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
@@ -32,10 +32,10 @@ import com.metamx.common.guava.Accumulator;
 import com.metamx.common.guava.ConcatSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.input.MapBasedRow;
-import com.metamx.druid.input.Row;
-import com.metamx.druid.input.Rows;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
+import io.druid.data.input.Rows;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
diff --git a/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java
index f4e45b8bb1d..51b938a9891 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/AlwaysHavingSpec.java
@@ -19,7 +19,7 @@
 
 package io.druid.query.groupby.having;
 
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  */
diff --git a/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java
index 0cd712a976f..8e0fdb6a91f 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/AndHavingSpec.java
@@ -22,7 +22,7 @@ package io.druid.query.groupby.having;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 import java.util.List;
 
diff --git a/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
index 65eb9444df9..34bd7b887f2 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
@@ -21,7 +21,7 @@ package io.druid.query.groupby.having;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  * The "=" operator in a "having" clause. This is similar to SQL's "having aggregation = value",
diff --git a/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
index 41f7864063c..0c2c9e7810b 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
@@ -21,7 +21,7 @@ package io.druid.query.groupby.having;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  * The ">" operator in a "having" clause. This is similar to SQL's "having aggregation > value",
diff --git a/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java
index 4d1dca3ad0f..00a8389cff0 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/HavingSpec.java
@@ -21,7 +21,7 @@ package io.druid.query.groupby.having;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  * A "having" clause that filters aggregated value. This is similar to SQL's "having"
diff --git a/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
index d54e1975b59..ce8dd20b661 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
@@ -20,7 +20,7 @@
 package io.druid.query.groupby.having;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  * The "<" operator in a "having" clause. This is similar to SQL's "having aggregation < value",
diff --git a/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java
index 67397a568a4..e963e0154e5 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/NotHavingSpec.java
@@ -21,7 +21,7 @@ package io.druid.query.groupby.having;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 /**
  * The logical "not" operator for the "having" clause.
diff --git a/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java b/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java
index 92a48cd7a55..73f46dfaa24 100644
--- a/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/OrHavingSpec.java
@@ -22,7 +22,7 @@ package io.druid.query.groupby.having;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 
 import java.util.List;
 
diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java b/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java
index 0b3933be110..4cd052058bf 100644
--- a/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/orderby/DefaultLimitSpec.java
@@ -31,7 +31,7 @@ import com.google.common.primitives.Longs;
 import com.metamx.common.ISE;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.dimension.DimensionSpec;
diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java b/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java
index 72a4417a051..0d07f1f91c9 100644
--- a/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/orderby/LimitSpec.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.base.Function;
 import com.metamx.common.guava.Sequence;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.dimension.DimensionSpec;
diff --git a/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java b/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java
index 0e2b6f3ed78..6fbc063c72d 100644
--- a/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/orderby/NoopLimitSpec.java
@@ -22,7 +22,7 @@ package io.druid.query.groupby.orderby;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.metamx.common.guava.Sequence;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.dimension.DimensionSpec;
diff --git a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
index 40e4aeac0b5..a5e1a1a8319 100644
--- a/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
@@ -31,9 +31,9 @@ import com.metamx.common.ISE;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.druid.collect.OrderedMergeSequence;
-import com.metamx.druid.utils.JodaUtils;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.collections.OrderedMergeSequence;
+import io.druid.common.utils.JodaUtils;
 import io.druid.query.CacheStrategy;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java
index 5fe1c591d6c..0fdefff0175 100644
--- a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java
@@ -35,8 +35,8 @@ import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.druid.collect.OrderedMergeSequence;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.collections.OrderedMergeSequence;
 import io.druid.query.CacheStrategy;
 import io.druid.query.IntervalChunkingQueryRunner;
 import io.druid.query.Query;
diff --git a/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java b/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java
index c8b1884b691..07d4436416c 100644
--- a/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java
+++ b/processing/src/main/java/io/druid/query/spec/MultipleIntervalSegmentSpec.java
@@ -21,7 +21,7 @@ package io.druid.query.spec;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.utils.JodaUtils;
+import io.druid.common.utils.JodaUtils;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.QuerySegmentWalker;
diff --git a/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java b/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java
index dbd536340b5..59dda1e0d67 100644
--- a/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java
+++ b/processing/src/main/java/io/druid/query/spec/MultipleSpecificSegmentSpec.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
-import com.metamx.druid.utils.JodaUtils;
+import io.druid.common.utils.JodaUtils;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.QuerySegmentWalker;
diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
index a84f238e02d..ba2ab0feb9e 100644
--- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
@@ -29,9 +29,8 @@ import com.google.common.collect.Ordering;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.LogicalSegment;
-import com.metamx.druid.collect.OrderedMergeSequence;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.collections.OrderedMergeSequence;
 import io.druid.query.BySegmentSkippingQueryRunner;
 import io.druid.query.CacheStrategy;
 import io.druid.query.Query;
@@ -39,6 +38,7 @@ import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChest;
 import io.druid.query.Result;
 import io.druid.query.aggregation.MetricManipulationFn;
+import io.druid.timeline.LogicalSegment;
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;
diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
index 48c2cef25bf..71f5755449d 100644
--- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
@@ -28,8 +28,8 @@ import com.google.common.collect.Ordering;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.druid.collect.OrderedMergeSequence;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.collections.OrderedMergeSequence;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.CacheStrategy;
 import io.druid.query.IntervalChunkingQueryRunner;
diff --git a/processing/src/main/java/io/druid/segment/CompressedPools.java b/processing/src/main/java/io/druid/segment/CompressedPools.java
index 658a09d263a..cccf216367e 100644
--- a/processing/src/main/java/io/druid/segment/CompressedPools.java
+++ b/processing/src/main/java/io/druid/segment/CompressedPools.java
@@ -21,9 +21,9 @@ package io.druid.segment;
 
 import com.google.common.base.Supplier;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidPool;
 import com.ning.compress.lzf.ChunkEncoder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidPool;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/processing/src/main/java/io/druid/segment/IndexIO.java b/processing/src/main/java/io/druid/segment/IndexIO.java
index 38d6367a360..990893c4b13 100644
--- a/processing/src/main/java/io/druid/segment/IndexIO.java
+++ b/processing/src/main/java/io/druid/segment/IndexIO.java
@@ -39,9 +39,9 @@ import com.metamx.common.io.smoosh.Smoosh;
 import com.metamx.common.io.smoosh.SmooshedFileMapper;
 import com.metamx.common.io.smoosh.SmooshedWriter;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-import com.metamx.druid.utils.SerializerUtils;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.common.utils.SerializerUtils;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.column.Column;
 import io.druid.segment.column.ColumnBuilder;
 import io.druid.segment.column.ColumnDescriptor;
diff --git a/processing/src/main/java/io/druid/segment/IndexMerger.java b/processing/src/main/java/io/druid/segment/IndexMerger.java
index 4f63cf33ee5..672cec724b5 100644
--- a/processing/src/main/java/io/druid/segment/IndexMerger.java
+++ b/processing/src/main/java/io/druid/segment/IndexMerger.java
@@ -43,13 +43,13 @@ import com.metamx.common.guava.MergeIterable;
 import com.metamx.common.guava.nary.BinaryFn;
 import com.metamx.common.io.smoosh.Smoosh;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.CombiningIterable;
-import com.metamx.druid.guava.FileOutputSupplier;
-import com.metamx.druid.guava.GuavaUtils;
-import com.metamx.druid.utils.JodaUtils;
-import com.metamx.druid.utils.SerializerUtils;
+import io.druid.collections.CombiningIterable;
+import io.druid.common.guava.FileOutputSupplier;
+import io.druid.common.guava.GuavaUtils;
+import io.druid.common.utils.JodaUtils;
+import io.druid.common.utils.SerializerUtils;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.ToLowerCaseAggregatorFactory;
+import io.druid.query.aggregation.ToLowerCaseAggregatorFactory;
 import io.druid.segment.data.ByteBufferWriter;
 import io.druid.segment.data.CompressedLongsSupplierSerializer;
 import io.druid.segment.data.ConciseCompressedIndexedInts;
diff --git a/processing/src/main/java/io/druid/segment/MetricHolder.java b/processing/src/main/java/io/druid/segment/MetricHolder.java
index 11a25cc0c7e..648f2fbe70c 100644
--- a/processing/src/main/java/io/druid/segment/MetricHolder.java
+++ b/processing/src/main/java/io/druid/segment/MetricHolder.java
@@ -25,7 +25,7 @@ import com.google.common.io.InputSupplier;
 import com.google.common.io.OutputSupplier;
 import com.metamx.common.IAE;
 import com.metamx.common.ISE;
-import com.metamx.druid.utils.SerializerUtils;
+import io.druid.common.utils.SerializerUtils;
 import io.druid.segment.data.CompressedFloatsIndexedSupplier;
 import io.druid.segment.data.CompressedFloatsSupplierSerializer;
 import io.druid.segment.data.GenericIndexed;
diff --git a/processing/src/main/java/io/druid/segment/data/CompressedFloatsIndexedSupplier.java b/processing/src/main/java/io/druid/segment/data/CompressedFloatsIndexedSupplier.java
index b21418e4048..c969d479068 100644
--- a/processing/src/main/java/io/druid/segment/data/CompressedFloatsIndexedSupplier.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedFloatsIndexedSupplier.java
@@ -25,8 +25,8 @@ import com.google.common.io.Closeables;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 import com.metamx.common.IAE;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/segment/data/CompressedFloatsSupplierSerializer.java b/processing/src/main/java/io/druid/segment/data/CompressedFloatsSupplierSerializer.java
index 16b816e1df4..d0bf42ee451 100644
--- a/processing/src/main/java/io/druid/segment/data/CompressedFloatsSupplierSerializer.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedFloatsSupplierSerializer.java
@@ -23,8 +23,8 @@ import com.google.common.io.ByteStreams;
 import com.google.common.io.Closeables;
 import com.google.common.io.OutputSupplier;
 import com.google.common.primitives.Ints;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/processing/src/main/java/io/druid/segment/data/CompressedLongsIndexedSupplier.java b/processing/src/main/java/io/druid/segment/data/CompressedLongsIndexedSupplier.java
index 153d10d29f9..c9d433b7740 100644
--- a/processing/src/main/java/io/druid/segment/data/CompressedLongsIndexedSupplier.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedLongsIndexedSupplier.java
@@ -25,8 +25,8 @@ import com.google.common.io.Closeables;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.metamx.common.IAE;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java b/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java
index 742332a7413..558c81afa47 100644
--- a/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java
@@ -24,8 +24,8 @@ import com.google.common.io.Closeables;
 import com.google.common.io.OutputSupplier;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java b/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
index fa69034fb43..2c42ca1327f 100644
--- a/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
@@ -21,10 +21,10 @@ package io.druid.segment.data;
 
 import com.google.common.base.Throwables;
 import com.google.common.io.Closeables;
-import com.metamx.druid.collect.ResourceHolder;
 import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFChunk;
 import com.ning.compress.lzf.LZFDecoder;
+import io.druid.collections.ResourceHolder;
 import io.druid.segment.CompressedPools;
 
 import java.io.IOException;
diff --git a/processing/src/main/java/io/druid/segment/data/InMemoryCompressedFloats.java b/processing/src/main/java/io/druid/segment/data/InMemoryCompressedFloats.java
index 15420d7c900..4e6aaac55fb 100644
--- a/processing/src/main/java/io/druid/segment/data/InMemoryCompressedFloats.java
+++ b/processing/src/main/java/io/druid/segment/data/InMemoryCompressedFloats.java
@@ -23,8 +23,8 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Closeables;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/segment/data/InMemoryCompressedLongs.java b/processing/src/main/java/io/druid/segment/data/InMemoryCompressedLongs.java
index de62d7b2de0..67a05b17508 100644
--- a/processing/src/main/java/io/druid/segment/data/InMemoryCompressedLongs.java
+++ b/processing/src/main/java/io/druid/segment/data/InMemoryCompressedLongs.java
@@ -23,8 +23,8 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Closeables;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidResourceHolder;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidResourceHolder;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/segment/data/IntBufferIndexedInts.java b/processing/src/main/java/io/druid/segment/data/IntBufferIndexedInts.java
index ebe7b01ae80..bb121602e85 100644
--- a/processing/src/main/java/io/druid/segment/data/IntBufferIndexedInts.java
+++ b/processing/src/main/java/io/druid/segment/data/IntBufferIndexedInts.java
@@ -21,7 +21,7 @@ package io.druid.segment.data;
 
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Ints;
-import com.metamx.druid.IntList;
+import io.druid.collections.IntList;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
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 ffe02cd8716..46bb96e9a10 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
@@ -33,9 +33,9 @@ import com.google.common.primitives.Longs;
 import com.metamx.common.IAE;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedRow;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.Aggregator;
 import io.druid.query.aggregation.AggregatorFactory;
diff --git a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowFormatter.java b/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowFormatter.java
index 0eca207f8fe..d5d8f4662de 100644
--- a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowFormatter.java
+++ b/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowFormatter.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Floats;
 import com.metamx.common.ISE;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java b/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java
index 03b54bb9f8c..c571d7627d6 100644
--- a/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java
+++ b/processing/src/main/java/io/druid/segment/serde/ComplexMetricExtractor.java
@@ -19,7 +19,7 @@
 
 package io.druid.segment.serde;
 
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 
 /**
  */
diff --git a/processing/src/test/java/io/druid/collections/CombiningIterableTest.java b/processing/src/test/java/io/druid/collections/CombiningIterableTest.java
index da839f1c249..e7c5e94d5af 100644
--- a/processing/src/test/java/io/druid/collections/CombiningIterableTest.java
+++ b/processing/src/test/java/io/druid/collections/CombiningIterableTest.java
@@ -20,7 +20,6 @@
 package io.druid.collections;
 
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.druid.CombiningIterable;
 import io.druid.query.Result;
 import org.joda.time.DateTime;
 import org.junit.Assert;
diff --git a/processing/src/test/java/io/druid/data/input/InputRowParserSerdeTest.java b/processing/src/test/java/io/druid/data/input/InputRowParserSerdeTest.java
index 264b9bcd4e7..a57962a6f37 100644
--- a/processing/src/test/java/io/druid/data/input/InputRowParserSerdeTest.java
+++ b/processing/src/test/java/io/druid/data/input/InputRowParserSerdeTest.java
@@ -23,8 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.incremental.SpatialDimensionSchema;
 import junit.framework.Assert;
 import org.joda.time.DateTime;
diff --git a/processing/src/test/java/io/druid/data/input/ProtoBufInputRowParserTest.java b/processing/src/test/java/io/druid/data/input/ProtoBufInputRowParserTest.java
index 92c337a0832..aa98a3bccb9 100644
--- a/processing/src/test/java/io/druid/data/input/ProtoBufInputRowParserTest.java
+++ b/processing/src/test/java/io/druid/data/input/ProtoBufInputRowParserTest.java
@@ -19,7 +19,6 @@
 
 package io.druid.data.input;
 
-import com.metamx.druid.input.InputRow;
 import org.joda.time.DateTime;
 import org.junit.Test;
 
diff --git a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java b/processing/src/test/java/io/druid/granularity/QueryGranularityTest.java
similarity index 98%
rename from common/src/test/java/com/metamx/druid/QueryGranularityTest.java
rename to processing/src/test/java/io/druid/granularity/QueryGranularityTest.java
index fd2eab75cab..9d0eb0287f0 100644
--- a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java
+++ b/processing/src/test/java/io/druid/granularity/QueryGranularityTest.java
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid;
+package io.druid.granularity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-import io.druid.granularity.DurationGranularity;
-import io.druid.granularity.PeriodGranularity;
-import io.druid.granularity.QueryGranularity;
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Days;
diff --git a/common/src/test/java/com/metamx/druid/jackson/DefaultObjectMapperTest.java b/processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java
similarity index 97%
rename from common/src/test/java/com/metamx/druid/jackson/DefaultObjectMapperTest.java
rename to processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java
index 8538b933183..2a87ae87853 100644
--- a/common/src/test/java/com/metamx/druid/jackson/DefaultObjectMapperTest.java
+++ b/processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.jackson;
+package io.druid.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import junit.framework.Assert;
diff --git a/processing/src/test/java/io/druid/query/QueriesTest.java b/processing/src/test/java/io/druid/query/QueriesTest.java
index 4b0f195bf9c..eaac2446d76 100644
--- a/processing/src/test/java/io/druid/query/QueriesTest.java
+++ b/processing/src/test/java/io/druid/query/QueriesTest.java
@@ -20,12 +20,12 @@
 package io.druid.query;
 
 import io.druid.query.aggregation.AggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.post.ArithmeticPostAggregator;
-import io.druid.query.aggregation.aggregation.post.ConstantPostAggregator;
-import io.druid.query.aggregation.aggregation.post.FieldAccessPostAggregator;
+import io.druid.query.aggregation.post.ArithmeticPostAggregator;
+import io.druid.query.aggregation.post.ConstantPostAggregator;
+import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 import junit.framework.Assert;
 import org.junit.Test;
 
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/CountAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java
similarity index 97%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/CountAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java
index 1de3f4166e9..2ca8584c939 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/CountAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java
similarity index 98%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java
index 9d686904dc4..326f1611398 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/DoubleSumAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/HistogramAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java
similarity index 97%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/HistogramAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java
index 83672731c00..b5473fee649 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/HistogramAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java
@@ -17,11 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.collect.Lists;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.BufferAggregator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java b/processing/src/test/java/io/druid/query/aggregation/HistogramTest.java
similarity index 94%
rename from common/src/test/java/com/metamx/druid/histogram/HistogramTest.java
rename to processing/src/test/java/io/druid/query/aggregation/HistogramTest.java
index 6d20d255708..5f944167450 100644
--- a/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/HistogramTest.java
@@ -17,12 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.histogram;
+package io.druid.query.aggregation;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-import io.druid.query.aggregation.aggregation.Histogram;
+import io.druid.jackson.DefaultObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java
similarity index 98%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java
index 3b526ee9381..abe84164b8b 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/JavaScriptAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java
@@ -17,12 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import io.druid.query.aggregation.Aggregator;
-import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.ObjectMetricSelector;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/LongSumAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java
similarity index 98%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/LongSumAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java
index 4caf2c89a2d..c218e9ffc48 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/LongSumAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/MaxAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/MaxAggregatorTest.java
similarity index 97%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/MaxAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/MaxAggregatorTest.java
index f30b03dc54d..c4083542fd0 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/MaxAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/MaxAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/MetricSelectorUtils.java b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
similarity index 96%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/MetricSelectorUtils.java
rename to processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
index e42e13df020..2a8ce68b601 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/MetricSelectorUtils.java
+++ b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import io.druid.segment.FloatMetricSelector;
 import io.druid.segment.ObjectMetricSelector;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/MinAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/MinAggregatorTest.java
similarity index 97%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/MinAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/MinAggregatorTest.java
index 998de6ac084..0c07e56770d 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/MinAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/MinAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/TestFloatMetricSelector.java b/processing/src/test/java/io/druid/query/aggregation/TestFloatMetricSelector.java
similarity index 96%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/TestFloatMetricSelector.java
rename to processing/src/test/java/io/druid/query/aggregation/TestFloatMetricSelector.java
index e3fe63a0565..d0e604ce36a 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/TestFloatMetricSelector.java
+++ b/processing/src/test/java/io/druid/query/aggregation/TestFloatMetricSelector.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation;
+package io.druid.query.aggregation;
 
 import io.druid.segment.FloatMetricSelector;
 
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
similarity index 96%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
index 33c8cef519b..6c0f49e96bd 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/post/ArithmeticPostAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
 import com.google.common.collect.Lists;
+import io.druid.query.aggregation.CountAggregator;
 import io.druid.query.aggregation.PostAggregator;
-import io.druid.query.aggregation.aggregation.CountAggregator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java
similarity index 97%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java
index fb235581b50..08d86452230 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/post/ConstantPostAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/post/ConstantPostAggregatorTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/common/src/test/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
similarity index 93%
rename from common/src/test/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregatorTest.java
rename to processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
index d2de2aef34f..5e20d488559 100644
--- a/common/src/test/java/io/druid/query/aggregation/aggregation/post/FieldAccessPostAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.query.aggregation.aggregation.post;
+package io.druid.query.aggregation.post;
 
-import io.druid.query.aggregation.aggregation.CountAggregator;
+import io.druid.query.aggregation.CountAggregator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java b/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java
index f62e9185ff3..460ace869b7 100644
--- a/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java
+++ b/processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.metamx.druid.input.MapBasedInputRow;
-import com.metamx.druid.input.Row;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.data.input.MapBasedInputRow;
+import io.druid.data.input.Row;
+import io.druid.jackson.DefaultObjectMapper;
 import org.junit.Test;
 
 import java.util.ArrayList;
diff --git a/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java b/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java
index 277ecd8e45b..0c43bd1176f 100644
--- a/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java
+++ b/processing/src/test/java/io/druid/query/spec/QuerySegmentSpecTest.java
@@ -22,7 +22,7 @@ package io.druid.query.spec;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.SegmentDescriptor;
 import org.joda.time.Interval;
 import org.junit.Assert;
diff --git a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java b/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java
index ccf7459fbb8..616d8d05938 100644
--- a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java
+++ b/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChestTest.java
@@ -19,7 +19,7 @@
 
 package io.druid.query.timeboundary;
 
-import com.metamx.druid.LogicalSegment;
+import io.druid.timeline.LogicalSegment;
 import junit.framework.Assert;
 import org.joda.time.Interval;
 import org.junit.Test;
diff --git a/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java b/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java
index cdc797a7e5a..03211178d25 100644
--- a/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java
+++ b/processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java
@@ -24,12 +24,12 @@ import com.google.common.collect.Lists;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.post.ArithmeticPostAggregator;
-import io.druid.query.aggregation.aggregation.post.ConstantPostAggregator;
-import io.druid.query.aggregation.aggregation.post.FieldAccessPostAggregator;
+import io.druid.query.aggregation.post.ArithmeticPostAggregator;
+import io.druid.query.aggregation.post.ConstantPostAggregator;
+import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 import junit.framework.Assert;
 import org.joda.time.DateTime;
 import org.junit.Test;
diff --git a/processing/src/test/java/io/druid/segment/data/CompressedFloatsSupplierSerializerTest.java b/processing/src/test/java/io/druid/segment/data/CompressedFloatsSupplierSerializerTest.java
index c19adad7786..7b670110269 100644
--- a/processing/src/test/java/io/druid/segment/data/CompressedFloatsSupplierSerializerTest.java
+++ b/processing/src/test/java/io/druid/segment/data/CompressedFloatsSupplierSerializerTest.java
@@ -20,7 +20,7 @@
 package io.druid.segment.data;
 
 import com.google.common.io.OutputSupplier;
-import com.metamx.druid.collect.ResourceHolder;
+import io.druid.collections.ResourceHolder;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/processing/src/test/java/io/druid/segment/data/CompressedLongsSupplierSerializerTest.java b/processing/src/test/java/io/druid/segment/data/CompressedLongsSupplierSerializerTest.java
index 23ed9053be4..029297e73e8 100644
--- a/processing/src/test/java/io/druid/segment/data/CompressedLongsSupplierSerializerTest.java
+++ b/processing/src/test/java/io/druid/segment/data/CompressedLongsSupplierSerializerTest.java
@@ -20,7 +20,7 @@
 package io.druid.segment.data;
 
 import com.google.common.io.OutputSupplier;
-import com.metamx.druid.collect.ResourceHolder;
+import io.druid.collections.ResourceHolder;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java
index e70d3c2a880..5a7b448a4a8 100644
--- a/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java
+++ b/processing/src/test/java/io/druid/segment/data/IncrementalIndexTest.java
@@ -20,8 +20,8 @@
 package io.druid.segment.data;
 
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.input.MapBasedInputRow;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.MapBasedInputRow;
+import io.druid.data.input.Row;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.incremental.IncrementalIndex;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/DbSegmentPublisher.java b/realtime/src/main/java/com/metamx/druid/realtime/DbSegmentPublisher.java
index 60c6d6538b5..20a0bfb53d0 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/DbSegmentPublisher.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/DbSegmentPublisher.java
@@ -21,8 +21,8 @@ package com.metamx.druid.realtime;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.db.DbTablesConfig;
 import io.druid.client.DataSegment;
+import io.druid.db.DbTablesConfig;
 import org.joda.time.DateTime;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/Indexer.java b/realtime/src/main/java/com/metamx/druid/realtime/Indexer.java
index 41056730856..b5734b20851 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/Indexer.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/Indexer.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
 
 package com.metamx.druid.realtime;
 
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 
 /**
  */
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java
index f207a8a3f11..575d8f93bb9 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java
@@ -27,12 +27,12 @@ import com.google.inject.Inject;
 import com.metamx.common.exception.FormattedException;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.plumber.Plumber;
 import com.metamx.druid.realtime.plumber.Sink;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.data.input.InputRow;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.NoopQueryRunner;
 import io.druid.query.Query;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/ClippedFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/ClippedFirehoseFactory.java
index fe12a749b43..fccdbd7b328 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/ClippedFirehoseFactory.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/ClippedFirehoseFactory.java
@@ -1,9 +1,28 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.realtime.firehose;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Predicate;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 import org.joda.time.Interval;
 
 import java.io.IOException;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/Firehose.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/Firehose.java
index 434300031f8..7bcaee8aa85 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/Firehose.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/Firehose.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
 
 package com.metamx.druid.realtime.firehose;
 
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 
 import java.io.Closeable;
 
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcDecoder.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcDecoder.java
index 3ce230fbcfe..f3423c22ab8 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcDecoder.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcDecoder.java
@@ -1,8 +1,27 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.realtime.firehose;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 import org.joda.time.DateTime;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
index b67a246fb24..b9595af5677 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2013  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ import com.ircclouds.irc.api.listeners.VariousMessageListenerAdapter;
 import com.ircclouds.irc.api.state.IIRCState;
 import com.metamx.common.Pair;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 import org.joda.time.DateTime;
 
 import java.io.IOException;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java
index 6b6d2b6bf91..7afb84f22c6 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java
@@ -24,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import com.metamx.common.exception.FormattedException;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
 import io.druid.data.input.ByteBufferInputRowParser;
+import io.druid.data.input.InputRow;
 import kafka.consumer.Consumer;
 import kafka.consumer.ConsumerConfig;
 import kafka.consumer.KafkaStream;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/PredicateFirehose.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/PredicateFirehose.java
index 3e0b519b492..b3b71551edd 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/PredicateFirehose.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/PredicateFirehose.java
@@ -1,7 +1,26 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.realtime.firehose;
 
 import com.google.common.base.Predicate;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 
 import java.io.IOException;
 
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/RabbitMQFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/RabbitMQFirehoseFactory.java
index df78a442aac..d11fcfd8fd6 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/RabbitMQFirehoseFactory.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/RabbitMQFirehoseFactory.java
@@ -22,13 +22,13 @@ package com.metamx.druid.realtime.firehose;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.ShutdownListener;
 import com.rabbitmq.client.ShutdownSignalException;
+import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 
 import java.io.IOException;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/TimedShutoffFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/TimedShutoffFirehoseFactory.java
index 8aeb3b3931f..0ecf05ee2f5 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/TimedShutoffFirehoseFactory.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/TimedShutoffFirehoseFactory.java
@@ -1,10 +1,29 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.realtime.firehose;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.metamx.druid.input.InputRow;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.data.input.InputRow;
 import org.joda.time.DateTime;
 
 import java.io.IOException;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
index fc45f5f4e91..862c99eeb60 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2013  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@ import com.maxmind.geoip2.DatabaseReader;
 import com.maxmind.geoip2.exception.GeoIp2Exception;
 import com.maxmind.geoip2.model.Omni;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
+import io.druid.data.input.InputRow;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
 
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
index da3a3d30be9..5ea85c16696 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
@@ -36,12 +36,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.metamx.common.Pair;
 import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.guava.FunctionalIterable;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.guava.ThreadRenamingCallable;
-import com.metamx.druid.guava.ThreadRenamingRunnable;
 import com.metamx.druid.loading.DataSegmentPusher;
-import com.metamx.druid.partition.SingleElementPartitionChunk;
 import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.druid.realtime.FireDepartmentMetrics;
 import com.metamx.druid.realtime.FireHydrant;
@@ -53,6 +48,8 @@ import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.client.DataSegment;
 import io.druid.client.DruidServer;
 import io.druid.client.ServerView;
+import io.druid.common.guava.ThreadRenamingCallable;
+import io.druid.common.guava.ThreadRenamingRunnable;
 import io.druid.query.MetricsEmittingQueryRunner;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
@@ -68,6 +65,9 @@ import io.druid.segment.QueryableIndex;
 import io.druid.segment.QueryableIndexSegment;
 import io.druid.segment.Segment;
 import io.druid.server.coordination.DataSegmentAnnouncer;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.SingleElementPartitionChunk;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/plumber/Sink.java b/realtime/src/main/java/com/metamx/druid/realtime/plumber/Sink.java
index 1b55407d244..e3d85cb9e26 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/plumber/Sink.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/plumber/Sink.java
@@ -27,10 +27,10 @@ import com.google.common.collect.Lists;
 import com.metamx.common.IAE;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.FireHydrant;
 import com.metamx.druid.realtime.Schema;
 import io.druid.client.DataSegment;
+import io.druid.data.input.InputRow;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.incremental.IncrementalIndex;
 import io.druid.segment.incremental.IncrementalIndexSchema;
diff --git a/realtime/src/main/java/io/druid/guice/guice/DbSegmentPublisherProvider.java b/realtime/src/main/java/io/druid/guice/guice/DbSegmentPublisherProvider.java
index 77de9676a0d..ca9c76b8db6 100644
--- a/realtime/src/main/java/io/druid/guice/guice/DbSegmentPublisherProvider.java
+++ b/realtime/src/main/java/io/druid/guice/guice/DbSegmentPublisherProvider.java
@@ -21,9 +21,9 @@ package io.druid.guice.guice;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.metamx.druid.db.DbTablesConfig;
 import com.metamx.druid.realtime.DbSegmentPublisher;
 import com.metamx.druid.realtime.SegmentPublisher;
+import io.druid.db.DbTablesConfig;
 import org.skife.jdbi.v2.IDBI;
 
 import javax.validation.constraints.NotNull;
diff --git a/realtime/src/test/java/com/metamx/druid/realtime/RealtimeManagerTest.java b/realtime/src/test/java/com/metamx/druid/realtime/RealtimeManagerTest.java
index d0d9b5c3f23..8934a8ce1a1 100644
--- a/realtime/src/test/java/com/metamx/druid/realtime/RealtimeManagerTest.java
+++ b/realtime/src/test/java/com/metamx/druid/realtime/RealtimeManagerTest.java
@@ -22,18 +22,18 @@ package com.metamx.druid.realtime;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import com.metamx.common.ISE;
-import com.metamx.druid.guava.Runnables;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.firehose.Firehose;
 import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import com.metamx.druid.realtime.plumber.Plumber;
 import com.metamx.druid.realtime.plumber.PlumberSchool;
 import com.metamx.druid.realtime.plumber.Sink;
+import io.druid.common.guava.Runnables;
+import io.druid.data.input.InputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.segment.incremental.SpatialDimensionSchema;
 import io.druid.server.shard.shard.NoneShardSpec;
 import junit.framework.Assert;
diff --git a/realtime/src/test/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchoolTest.java b/realtime/src/test/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchoolTest.java
index a0904ffce39..5720c387afc 100644
--- a/realtime/src/test/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchoolTest.java
+++ b/realtime/src/test/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchoolTest.java
@@ -36,7 +36,7 @@ import io.druid.granularity.QueryGranularity;
 import io.druid.query.Query;
 import io.druid.query.QueryRunnerFactory;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.segment.IndexGranularity;
 import io.druid.segment.incremental.SpatialDimensionSchema;
 import io.druid.server.coordination.DataSegmentAnnouncer;
diff --git a/realtime/src/test/java/com/metamx/druid/realtime/plumber/SinkTest.java b/realtime/src/test/java/com/metamx/druid/realtime/plumber/SinkTest.java
index 1a1b51b32fa..1e790b645cd 100644
--- a/realtime/src/test/java/com/metamx/druid/realtime/plumber/SinkTest.java
+++ b/realtime/src/test/java/com/metamx/druid/realtime/plumber/SinkTest.java
@@ -21,12 +21,12 @@ package com.metamx.druid.realtime.plumber;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
-import com.metamx.druid.input.InputRow;
 import com.metamx.druid.realtime.FireHydrant;
 import com.metamx.druid.realtime.Schema;
+import io.druid.data.input.InputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.segment.incremental.SpatialDimensionSchema;
 import io.druid.server.shard.shard.NoneShardSpec;
 import junit.framework.Assert;
diff --git a/server/src/main/antlr4/com/metamx/druid/sql/antlr4/DruidSQL.g4 b/server/src/main/antlr4/com/metamx/druid/sql/antlr4/DruidSQL.g4
index 316bcce2af7..1cafead058d 100644
--- a/server/src/main/antlr4/com/metamx/druid/sql/antlr4/DruidSQL.g4
+++ b/server/src/main/antlr4/com/metamx/druid/sql/antlr4/DruidSQL.g4
@@ -3,17 +3,17 @@ grammar DruidSQL;
 @header {
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MaxAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MinAggregatorFactory;
-import io.druid.query.aggregation.aggregation.post.ArithmeticPostAggregator;
-import io.druid.query.aggregation.aggregation.post.ConstantPostAggregator;
-import io.druid.query.aggregation.aggregation.post.FieldAccessPostAggregator;
 import io.druid.granularity.PeriodGranularity;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.AggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.MaxAggregatorFactory;
+import io.druid.query.aggregation.MinAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
+import io.druid.query.aggregation.post.ArithmeticPostAggregator;
+import io.druid.query.aggregation.post.ConstantPostAggregator;
+import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 import io.druid.query.dimension.DefaultDimensionSpec;
 import io.druid.query.dimension.DimensionSpec;
 import io.druid.query.filter.AndDimFilter;
diff --git a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java
index 4ea95e757f8..9b8afa6dbff 100644
--- a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java
+++ b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java
@@ -25,19 +25,15 @@ import com.google.common.collect.Ordering;
 import com.google.inject.Inject;
 import com.metamx.common.ISE;
 import com.metamx.common.guava.FunctionalIterable;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.collect.CountingMap;
 import com.metamx.druid.loading.SegmentLoader;
 import com.metamx.druid.loading.SegmentLoadingException;
-import com.metamx.druid.partition.PartitionChunk;
-import com.metamx.druid.partition.PartitionHolder;
 import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.druid.query.ReferenceCountingSegmentQueryRunner;
 import com.metamx.emitter.EmittingLogger;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.client.DataSegment;
+import io.druid.collections.CountingMap;
 import io.druid.guice.guice.annotations.Processing;
 import io.druid.query.BySegmentQueryRunner;
 import io.druid.query.FinalizeResultsQueryRunner;
@@ -54,6 +50,10 @@ import io.druid.query.spec.SpecificSegmentQueryRunner;
 import io.druid.query.spec.SpecificSegmentSpec;
 import io.druid.segment.ReferenceCountingSegment;
 import io.druid.segment.Segment;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.PartitionChunk;
+import io.druid.timeline.partition.PartitionHolder;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
diff --git a/server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java b/server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
index 03242062563..f7b85654a76 100644
--- a/server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
+++ b/server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
@@ -31,9 +31,10 @@ import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.druid.master.rules.PeriodLoadRule;
 import com.metamx.druid.master.rules.Rule;
+import io.druid.concurrent.Execs;
+import io.druid.db.DbTablesConfig;
 import io.druid.guice.guice.ManageLifecycle;
 import io.druid.guice.guice.annotations.Json;
 import org.joda.time.DateTime;
diff --git a/server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerProvider.java b/server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerProvider.java
index 3b42bf26340..2675316fc17 100644
--- a/server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerProvider.java
+++ b/server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerProvider.java
@@ -25,6 +25,8 @@ import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.metamx.common.lifecycle.Lifecycle;
+import io.druid.db.DbConnector;
+import io.druid.db.DbTablesConfig;
 
 /**
  */
diff --git a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
index 5eeeaf320a6..bc41f9e9a12 100644
--- a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
+++ b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
@@ -30,13 +30,14 @@ import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.concurrent.Execs;
-import com.metamx.druid.partition.PartitionChunk;
 import io.druid.client.DataSegment;
 import io.druid.client.DruidDataSource;
+import io.druid.concurrent.Execs;
+import io.druid.db.DbTablesConfig;
 import io.druid.guice.guice.ManageLifecycle;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.PartitionChunk;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.joda.time.Interval;
diff --git a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerProvider.java b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerProvider.java
index 02abdbafb67..13226aab73e 100644
--- a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerProvider.java
+++ b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerProvider.java
@@ -24,6 +24,8 @@ import com.google.common.base.Supplier;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.metamx.common.lifecycle.Lifecycle;
+import io.druid.db.DbConnector;
+import io.druid.db.DbTablesConfig;
 
 /**
  */
diff --git a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPuller.java b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPuller.java
index f79cc2a6213..4f05b3b23d9 100644
--- a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPuller.java
+++ b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPuller.java
@@ -21,8 +21,8 @@ package com.metamx.druid.loading;
 
 import com.google.common.io.Closeables;
 import com.google.inject.Inject;
-import com.metamx.druid.utils.CompressionUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
diff --git a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusher.java b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusher.java
index e97e1327755..301f47b8af7 100644
--- a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusher.java
+++ b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusher.java
@@ -26,8 +26,8 @@ import com.google.common.io.Closeables;
 import com.google.common.io.OutputSupplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.utils.CompressionUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import io.druid.segment.IndexIO;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
diff --git a/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPuller.java b/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPuller.java
index 8378d932b1a..c3aca6f4376 100644
--- a/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPuller.java
+++ b/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPuller.java
@@ -22,8 +22,8 @@ package com.metamx.druid.loading;
 import com.google.common.io.Files;
 import com.metamx.common.MapUtils;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.utils.CompressionUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPusher.java b/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPusher.java
index 0d191c48f17..8cdb62ed0bc 100644
--- a/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPusher.java
+++ b/server/src/main/java/com/metamx/druid/loading/LocalDataSegmentPusher.java
@@ -25,8 +25,8 @@ import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.utils.CompressionUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import io.druid.segment.IndexIO;
 
 import java.io.File;
diff --git a/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPuller.java b/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPuller.java
index eb3d5200112..a552fe94418 100644
--- a/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPuller.java
+++ b/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPuller.java
@@ -27,8 +27,8 @@ import com.google.inject.Inject;
 import com.metamx.common.ISE;
 import com.metamx.common.MapUtils;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.utils.CompressionUtils;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import io.druid.storage.s3.S3Utils;
 import org.apache.commons.io.FileUtils;
 import org.jets3t.service.ServiceException;
diff --git a/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusher.java b/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusher.java
index 78d1ad2b515..08688ded001 100644
--- a/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusher.java
+++ b/server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusher.java
@@ -26,9 +26,9 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
 import com.google.inject.Inject;
-import com.metamx.druid.utils.CompressionUtils;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import io.druid.segment.IndexIO;
 import io.druid.storage.s3.S3Utils;
 import org.jets3t.service.ServiceException;
diff --git a/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPuller.java b/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPuller.java
index 74bffc1d757..cb77a16b21a 100644
--- a/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPuller.java
+++ b/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPuller.java
@@ -25,13 +25,13 @@ import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
 import com.metamx.druid.loading.DataSegmentPuller;
 import com.metamx.druid.loading.SegmentLoadingException;
-import com.metamx.druid.utils.CompressionUtils;
 import com.netflix.astyanax.connectionpool.OperationResult;
 import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 import com.netflix.astyanax.model.ColumnList;
 import com.netflix.astyanax.recipes.storage.ChunkedStorage;
 import com.netflix.astyanax.recipes.storage.ObjectMetadata;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPusher.java b/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPusher.java
index dfe925d97f3..e2983cc4a69 100644
--- a/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPusher.java
+++ b/server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentPusher.java
@@ -26,10 +26,10 @@ import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import com.metamx.druid.loading.DataSegmentPusher;
 import com.metamx.druid.loading.DataSegmentPusherUtil;
-import com.metamx.druid.utils.CompressionUtils;
 import com.netflix.astyanax.MutationBatch;
 import com.netflix.astyanax.recipes.storage.ChunkedStorage;
 import io.druid.client.DataSegment;
+import io.druid.common.utils.CompressionUtils;
 import io.druid.segment.IndexIO;
 
 import java.io.File;
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMaster.java b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
index 8a60ba00760..56348a6f1fd 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMaster.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
@@ -37,8 +37,6 @@ import com.metamx.common.guava.Comparators;
 import com.metamx.common.guava.FunctionalIterable;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.concurrent.Execs;
-import com.metamx.druid.config.JacksonConfigManager;
 import com.metamx.druid.db.DatabaseRuleManager;
 import com.metamx.druid.db.DatabaseSegmentManager;
 import com.metamx.emitter.EmittingLogger;
@@ -49,6 +47,8 @@ import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.ServerInventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
+import io.druid.common.config.JacksonConfigManager;
+import io.druid.concurrent.Execs;
 import io.druid.guice.guice.ManageLifecycle;
 import io.druid.segment.IndexIO;
 import io.druid.server.initialization.initialization.ZkPathsConfig;
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterCleanup.java b/server/src/main/java/com/metamx/druid/master/DruidMasterCleanup.java
index 72d011afbe8..d5c25ea7187 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMasterCleanup.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMasterCleanup.java
@@ -23,11 +23,11 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.MinMaxPriorityQueue;
 import com.metamx.common.guava.Comparators;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
 import io.druid.client.DataSegment;
 import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java b/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java
index 5b2a3a5486d..c0689f4c518 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java
@@ -22,12 +22,12 @@ package com.metamx.druid.master;
 import com.google.common.collect.Maps;
 import com.google.common.collect.MinMaxPriorityQueue;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.collect.CountingMap;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.client.DataSegment;
 import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
+import io.druid.collections.CountingMap;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java
index 90fe682a8c0..052fdd58414 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java
@@ -32,12 +32,12 @@ import com.metamx.common.ISE;
 import com.metamx.common.Pair;
 import com.metamx.common.guava.FunctionalIterable;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.partition.PartitionChunk;
 import io.druid.client.DataSegment;
 import io.druid.client.indexing.IndexingServiceClient;
 import io.druid.server.shard.shard.NoneShardSpec;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.PartitionChunk;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
diff --git a/server/src/main/java/com/metamx/druid/master/MasterStats.java b/server/src/main/java/com/metamx/druid/master/MasterStats.java
index 7cdbe510395..3fbb46329f1 100644
--- a/server/src/main/java/com/metamx/druid/master/MasterStats.java
+++ b/server/src/main/java/com/metamx/druid/master/MasterStats.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,7 +20,7 @@
 package com.metamx.druid.master;
 
 import com.google.common.collect.Maps;
-import com.metamx.druid.collect.CountingMap;
+import io.druid.collections.CountingMap;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/server/src/main/java/com/metamx/druid/metrics/MetricsModule.java b/server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
index 99f567e46ff..daf3cd2c65e 100644
--- a/server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
+++ b/server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
@@ -30,10 +30,10 @@ import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.name.Names;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.metrics.Monitor;
 import com.metamx.metrics.MonitorScheduler;
+import io.druid.concurrent.Execs;
 import io.druid.guice.guice.JsonConfigProvider;
 import io.druid.guice.guice.JsonConfigurator;
 import io.druid.guice.guice.LazySingleton;
diff --git a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
index feec009ccdd..23434f09d09 100644
--- a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
+++ b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
@@ -35,10 +35,10 @@ import com.metamx.common.guava.FunctionalIterator;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
 import com.metamx.common.parsers.CloseableIterator;
-import com.metamx.druid.collect.ResourceHolder;
-import com.metamx.druid.collect.StupidPool;
-import com.metamx.druid.input.MapBasedRow;
-import com.metamx.druid.input.Row;
+import io.druid.collections.ResourceHolder;
+import io.druid.collections.StupidPool;
+import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
 import io.druid.guice.guice.annotations.Global;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.BufferAggregator;
diff --git a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java
index f525c2b6631..db30b5aaaac 100644
--- a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java
+++ b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java
@@ -29,7 +29,7 @@ import com.metamx.common.ISE;
 import com.metamx.common.guava.ExecutorExecutingSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.input.Row;
+import io.druid.data.input.Row;
 import io.druid.query.ChainedExecutionQueryRunner;
 import io.druid.query.ConcatQueryRunner;
 import io.druid.query.Query;
diff --git a/server/src/main/java/io/druid/client/BrokerServerView.java b/server/src/main/java/io/druid/client/BrokerServerView.java
index cee1168bd33..1c5055ab818 100644
--- a/server/src/main/java/io/druid/client/BrokerServerView.java
+++ b/server/src/main/java/io/druid/client/BrokerServerView.java
@@ -24,15 +24,15 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.concurrent.Execs;
-import com.metamx.druid.partition.PartitionChunk;
 import com.metamx.http.client.HttpClient;
 import io.druid.client.selector.QueryableDruidServer;
 import io.druid.client.selector.ServerSelector;
+import io.druid.concurrent.Execs;
 import io.druid.guice.guice.annotations.Client;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChestWarehouse;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.PartitionChunk;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/server/src/main/java/io/druid/client/CachingClusteredClient.java b/server/src/main/java/io/druid/client/CachingClusteredClient.java
index a921ccaee02..870ecdcdc5b 100644
--- a/server/src/main/java/io/druid/client/CachingClusteredClient.java
+++ b/server/src/main/java/io/druid/client/CachingClusteredClient.java
@@ -38,9 +38,6 @@ import com.metamx.common.guava.BaseSequence;
 import com.metamx.common.guava.LazySequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.TimelineObjectHolder;
-import com.metamx.druid.VersionedIntervalTimeline;
-import com.metamx.druid.partition.PartitionChunk;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.client.cache.Cache;
 import io.druid.client.selector.QueryableDruidServer;
@@ -56,6 +53,9 @@ import io.druid.query.SegmentDescriptor;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.MetricManipulationFn;
 import io.druid.query.spec.MultipleSpecificSegmentSpec;
+import io.druid.timeline.TimelineObjectHolder;
+import io.druid.timeline.VersionedIntervalTimeline;
+import io.druid.timeline.partition.PartitionChunk;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
diff --git a/server/src/main/java/io/druid/client/DataSegment.java b/server/src/main/java/io/druid/client/DataSegment.java
index f6549d8de58..fc5c95e183f 100644
--- a/server/src/main/java/io/druid/client/DataSegment.java
+++ b/server/src/main/java/io/druid/client/DataSegment.java
@@ -29,8 +29,8 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.metamx.common.Granularity;
-import com.metamx.druid.jackson.CommaListJoinDeserializer;
-import com.metamx.druid.jackson.CommaListJoinSerializer;
+import io.druid.jackson.CommaListJoinDeserializer;
+import io.druid.jackson.CommaListJoinSerializer;
 import io.druid.query.SegmentDescriptor;
 import io.druid.server.shard.shard.NoneShardSpec;
 import io.druid.server.shard.shard.ShardSpec;
diff --git a/server/src/main/java/io/druid/client/ServerInventoryView.java b/server/src/main/java/io/druid/client/ServerInventoryView.java
index ebc3c8b8ab0..8b450aabbb4 100644
--- a/server/src/main/java/io/druid/client/ServerInventoryView.java
+++ b/server/src/main/java/io/druid/client/ServerInventoryView.java
@@ -27,8 +27,8 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.MapMaker;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.concurrent.Execs;
 import io.druid.curator.inventory.CuratorInventoryManager;
 import io.druid.curator.inventory.CuratorInventoryManagerStrategy;
 import io.druid.curator.inventory.InventoryManagerConfig;
diff --git a/server/src/main/java/io/druid/client/TimelineServerView.java b/server/src/main/java/io/druid/client/TimelineServerView.java
index 29b3164a4f2..7082c599c75 100644
--- a/server/src/main/java/io/druid/client/TimelineServerView.java
+++ b/server/src/main/java/io/druid/client/TimelineServerView.java
@@ -19,9 +19,9 @@
 
 package io.druid.client;
 
-import com.metamx.druid.VersionedIntervalTimeline;
 import io.druid.client.selector.ServerSelector;
 import io.druid.query.QueryRunner;
+import io.druid.timeline.VersionedIntervalTimeline;
 
 /**
  */
diff --git a/server/src/main/java/io/druid/guice/guice/AnnouncerModule.java b/server/src/main/java/io/druid/guice/guice/AnnouncerModule.java
index fc5c4159d09..c746b500022 100644
--- a/server/src/main/java/io/druid/guice/guice/AnnouncerModule.java
+++ b/server/src/main/java/io/druid/guice/guice/AnnouncerModule.java
@@ -22,7 +22,7 @@ package io.druid.guice.guice;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
-import com.metamx.druid.concurrent.Execs;
+import io.druid.concurrent.Execs;
 import io.druid.curator.announcement.Announcer;
 import io.druid.server.coordination.BatchDataSegmentAnnouncer;
 import io.druid.server.coordination.DataSegmentAnnouncer;
diff --git a/server/src/main/java/io/druid/guice/guice/DruidProcessingModule.java b/server/src/main/java/io/druid/guice/guice/DruidProcessingModule.java
index ae859ef58d1..087247b32bb 100644
--- a/server/src/main/java/io/druid/guice/guice/DruidProcessingModule.java
+++ b/server/src/main/java/io/druid/guice/guice/DruidProcessingModule.java
@@ -28,10 +28,10 @@ import com.google.inject.ProvisionException;
 import com.metamx.common.concurrent.ExecutorServiceConfig;
 import com.metamx.common.logger.Logger;
 import com.metamx.druid.DruidProcessingConfig;
-import com.metamx.druid.collect.StupidPool;
-import com.metamx.druid.concurrent.Execs;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
+import io.druid.collections.StupidPool;
+import io.druid.concurrent.Execs;
 import io.druid.guice.guice.annotations.Global;
 import io.druid.guice.guice.annotations.Processing;
 import io.druid.query.MetricsEmittingExecutorService;
diff --git a/server/src/main/java/io/druid/server/DruidNode.java b/server/src/main/java/io/druid/server/DruidNode.java
index 69fece2c685..4c8528bd6ee 100644
--- a/server/src/main/java/io/druid/server/DruidNode.java
+++ b/server/src/main/java/io/druid/server/DruidNode.java
@@ -21,7 +21,7 @@ package io.druid.server;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.utils.SocketUtil;
+import io.druid.common.utils.SocketUtil;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
diff --git a/server/src/main/java/io/druid/server/http/MasterSegmentSettingsResource.java b/server/src/main/java/io/druid/server/http/MasterSegmentSettingsResource.java
index 0205dfaaff4..70f4e5af955 100644
--- a/server/src/main/java/io/druid/server/http/MasterSegmentSettingsResource.java
+++ b/server/src/main/java/io/druid/server/http/MasterSegmentSettingsResource.java
@@ -16,10 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
 package io.druid.server.http;
 
-import com.metamx.druid.config.JacksonConfigManager;
 import com.metamx.druid.master.MasterSegmentSettings;
+import io.druid.common.config.JacksonConfigManager;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
diff --git a/server/src/main/java/io/druid/server/initialization/initialization/Initialization.java b/server/src/main/java/io/druid/server/initialization/initialization/Initialization.java
index dc3ea672d2a..4ce5f5d65c4 100644
--- a/server/src/main/java/io/druid/server/initialization/initialization/Initialization.java
+++ b/server/src/main/java/io/druid/server/initialization/initialization/Initialization.java
@@ -28,12 +28,12 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.metamx.common.ISE;
-import com.metamx.druid.jackson.JacksonModule;
 import io.druid.guice.guice.DruidGuiceExtensions;
 import io.druid.guice.guice.DruidSecondaryModule;
 import io.druid.guice.guice.annotations.Json;
 import io.druid.guice.guice.annotations.Smile;
 import io.druid.initialization.DruidModule;
+import io.druid.jackson.JacksonModule;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
diff --git a/server/src/main/java/io/druid/server/shard/shard/LinearShardSpec.java b/server/src/main/java/io/druid/server/shard/shard/LinearShardSpec.java
index 5de078c369a..5685b90f301 100644
--- a/server/src/main/java/io/druid/server/shard/shard/LinearShardSpec.java
+++ b/server/src/main/java/io/druid/server/shard/shard/LinearShardSpec.java
@@ -22,9 +22,9 @@ package io.druid.server.shard.shard;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.partition.LinearPartitionChunk;
-import com.metamx.druid.partition.PartitionChunk;
+import io.druid.data.input.InputRow;
+import io.druid.timeline.partition.LinearPartitionChunk;
+import io.druid.timeline.partition.PartitionChunk;
 
 import java.util.Map;
 
diff --git a/server/src/main/java/io/druid/server/shard/shard/NoneShardSpec.java b/server/src/main/java/io/druid/server/shard/shard/NoneShardSpec.java
index f0dea959b1a..cd5878d12b4 100644
--- a/server/src/main/java/io/druid/server/shard/shard/NoneShardSpec.java
+++ b/server/src/main/java/io/druid/server/shard/shard/NoneShardSpec.java
@@ -19,9 +19,9 @@
 
 package io.druid.server.shard.shard;
 
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.partition.PartitionChunk;
-import com.metamx.druid.partition.SingleElementPartitionChunk;
+import io.druid.data.input.InputRow;
+import io.druid.timeline.partition.PartitionChunk;
+import io.druid.timeline.partition.SingleElementPartitionChunk;
 
 import java.util.Map;
 
diff --git a/server/src/main/java/io/druid/server/shard/shard/NumberedShardSpec.java b/server/src/main/java/io/druid/server/shard/shard/NumberedShardSpec.java
index 999afaf1f91..df5de006ed6 100644
--- a/server/src/main/java/io/druid/server/shard/shard/NumberedShardSpec.java
+++ b/server/src/main/java/io/druid/server/shard/shard/NumberedShardSpec.java
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.partition.NumberedPartitionChunk;
-import com.metamx.druid.partition.PartitionChunk;
+import io.druid.data.input.InputRow;
+import io.druid.timeline.partition.NumberedPartitionChunk;
+import io.druid.timeline.partition.PartitionChunk;
 
 import java.util.Map;
 
diff --git a/server/src/main/java/io/druid/server/shard/shard/ShardSpec.java b/server/src/main/java/io/druid/server/shard/shard/ShardSpec.java
index ce3655b8287..2139c52999f 100644
--- a/server/src/main/java/io/druid/server/shard/shard/ShardSpec.java
+++ b/server/src/main/java/io/druid/server/shard/shard/ShardSpec.java
@@ -21,8 +21,8 @@ package io.druid.server.shard.shard;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.partition.PartitionChunk;
+import io.druid.data.input.InputRow;
+import io.druid.timeline.partition.PartitionChunk;
 
 import java.util.Map;
 
diff --git a/server/src/main/java/io/druid/server/shard/shard/SingleDimensionShardSpec.java b/server/src/main/java/io/druid/server/shard/shard/SingleDimensionShardSpec.java
index dfe7b15ab43..a81742cd302 100644
--- a/server/src/main/java/io/druid/server/shard/shard/SingleDimensionShardSpec.java
+++ b/server/src/main/java/io/druid/server/shard/shard/SingleDimensionShardSpec.java
@@ -20,9 +20,9 @@
 package io.druid.server.shard.shard;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.partition.PartitionChunk;
-import com.metamx.druid.partition.StringPartitionChunk;
+import io.druid.data.input.InputRow;
+import io.druid.timeline.partition.PartitionChunk;
+import io.druid.timeline.partition.StringPartitionChunk;
 
 import java.util.List;
 import java.util.Map;
diff --git a/server/src/main/java/io/druid/server/sql/SQLRunner.java b/server/src/main/java/io/druid/server/sql/SQLRunner.java
index dcd399ae1af..abbcef30746 100644
--- a/server/src/main/java/io/druid/server/sql/SQLRunner.java
+++ b/server/src/main/java/io/druid/server/sql/SQLRunner.java
@@ -27,10 +27,10 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Closeables;
-import com.metamx.druid.input.Row;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.sql.antlr4.DruidSQLLexer;
 import com.metamx.druid.sql.antlr4.DruidSQLParser;
+import io.druid.data.input.Row;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.Druids;
 import io.druid.query.Query;
 import io.druid.query.Result;
diff --git a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java
index 59e0fd0b117..9e188d99860 100644
--- a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java
+++ b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java
@@ -22,8 +22,8 @@ package com.metamx.druid.coordination;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.DataSegment;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.IndexIO;
 import io.druid.server.shard.shard.NoneShardSpec;
 import org.joda.time.Interval;
diff --git a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java
index 246fd66301a..695e69d2c4c 100644
--- a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java
+++ b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java
@@ -22,8 +22,8 @@ package com.metamx.druid.coordination;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.DataSegment;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.IndexIO;
 import io.druid.server.shard.shard.NoneShardSpec;
 import org.joda.time.Interval;
diff --git a/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java b/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java
index ce269821d40..87fef52ca16 100644
--- a/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java
+++ b/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java
@@ -24,15 +24,15 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.concurrent.Execs;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.loading.CacheTestSegmentLoader;
 import com.metamx.druid.loading.SegmentLoaderConfig;
 import com.metamx.druid.metrics.NoopServiceEmitter;
 import com.metamx.druid.query.NoopQueryRunnerFactoryConglomerate;
 import io.druid.client.DataSegment;
+import io.druid.concurrent.Execs;
 import io.druid.curator.CuratorTestBase;
 import io.druid.curator.announcement.Announcer;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.IndexIO;
 import io.druid.server.coordination.DataSegmentAnnouncer;
 import io.druid.server.coordination.DruidServerMetadata;
diff --git a/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java b/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java
index 5c61217e430..3e805e4b224 100644
--- a/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java
+++ b/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,7 +21,8 @@ package com.metamx.druid.db;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.db.DbTablesConfig;
+import io.druid.jackson.DefaultObjectMapper;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
diff --git a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterBonusTest.java b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterBonusTest.java
index d2a9b74cfad..fecedf49b3d 100644
--- a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterBonusTest.java
+++ b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterBonusTest.java
@@ -25,16 +25,16 @@ import com.google.common.collect.Lists;
 import com.metamx.collections.spatial.search.RadiusBound;
 import com.metamx.collections.spatial.search.RectangularBound;
 import com.metamx.druid.TestHelper;
-import com.metamx.druid.input.MapBasedInputRow;
 import com.metamx.druid.query.timeseries.TimeseriesQueryRunnerFactory;
+import io.druid.data.input.MapBasedInputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.QueryRunner;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
 import io.druid.query.filter.SpatialDimFilter;
 import io.druid.query.timeseries.TimeseriesQuery;
 import io.druid.query.timeseries.TimeseriesResultValue;
diff --git a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
index 91915dff882..bed94e3e3c4 100644
--- a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
+++ b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
@@ -25,16 +25,16 @@ import com.google.common.collect.Lists;
 import com.metamx.collections.spatial.search.RadiusBound;
 import com.metamx.collections.spatial.search.RectangularBound;
 import com.metamx.druid.TestHelper;
-import com.metamx.druid.input.MapBasedInputRow;
 import com.metamx.druid.query.timeseries.TimeseriesQueryRunnerFactory;
+import io.druid.data.input.MapBasedInputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.QueryRunner;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
 import io.druid.query.filter.SpatialDimFilter;
 import io.druid.query.timeseries.TimeseriesQuery;
 import io.druid.query.timeseries.TimeseriesResultValue;
diff --git a/server/src/test/java/com/metamx/druid/index/v1/IndexMergerTest.java b/server/src/test/java/com/metamx/druid/index/v1/IndexMergerTest.java
index f2fa2849ffd..aebf048913b 100644
--- a/server/src/test/java/com/metamx/druid/index/v1/IndexMergerTest.java
+++ b/server/src/test/java/com/metamx/druid/index/v1/IndexMergerTest.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
-import com.metamx.druid.input.MapBasedInputRow;
+import io.druid.data.input.MapBasedInputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.IndexIO;
diff --git a/server/src/test/java/com/metamx/druid/index/v1/TestIndex.java b/server/src/test/java/com/metamx/druid/index/v1/TestIndex.java
index dc4878a6912..f72c3f43835 100644
--- a/server/src/test/java/com/metamx/druid/index/v1/TestIndex.java
+++ b/server/src/test/java/com/metamx/druid/index/v1/TestIndex.java
@@ -30,7 +30,7 @@ import io.druid.data.input.StringInputRowParser;
 import io.druid.data.input.TimestampSpec;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMerger;
 import io.druid.segment.QueryableIndex;
diff --git a/server/src/test/java/com/metamx/druid/query/QueryRunnerTestHelper.java b/server/src/test/java/com/metamx/druid/query/QueryRunnerTestHelper.java
index f24c7aa4d31..d70f875ff7e 100644
--- a/server/src/test/java/com/metamx/druid/query/QueryRunnerTestHelper.java
+++ b/server/src/test/java/com/metamx/druid/query/QueryRunnerTestHelper.java
@@ -27,12 +27,12 @@ import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryRunnerFactory;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.post.ArithmeticPostAggregator;
-import io.druid.query.aggregation.aggregation.post.ConstantPostAggregator;
-import io.druid.query.aggregation.aggregation.post.FieldAccessPostAggregator;
+import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.post.ArithmeticPostAggregator;
+import io.druid.query.aggregation.post.ConstantPostAggregator;
+import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 import io.druid.query.spec.MultipleIntervalSegmentSpec;
 import io.druid.query.spec.QuerySegmentSpec;
 import io.druid.segment.IncrementalIndexSegment;
diff --git a/server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java b/server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
index fc1e93c8720..32058036db5 100644
--- a/server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
+++ b/server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
@@ -31,17 +31,17 @@ import com.google.common.collect.Ordering;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
 import com.metamx.druid.TestHelper;
-import com.metamx.druid.collect.StupidPool;
-import com.metamx.druid.input.MapBasedRow;
-import com.metamx.druid.input.Row;
 import com.metamx.druid.query.QueryRunnerTestHelper;
+import io.druid.collections.StupidPool;
+import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
 import io.druid.granularity.PeriodGranularity;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.DoubleSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
 import io.druid.query.dimension.DefaultDimensionSpec;
 import io.druid.query.dimension.DimensionSpec;
 import io.druid.query.filter.RegexDimFilter;
diff --git a/server/src/test/java/com/metamx/druid/query/group/GroupByTimeseriesQueryRunnerTest.java b/server/src/test/java/com/metamx/druid/query/group/GroupByTimeseriesQueryRunnerTest.java
index 6fc14793192..da3a1438d7e 100644
--- a/server/src/test/java/com/metamx/druid/query/group/GroupByTimeseriesQueryRunnerTest.java
+++ b/server/src/test/java/com/metamx/druid/query/group/GroupByTimeseriesQueryRunnerTest.java
@@ -25,11 +25,11 @@ import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.collect.StupidPool;
-import com.metamx.druid.input.MapBasedRow;
-import com.metamx.druid.input.Row;
 import com.metamx.druid.query.QueryRunnerTestHelper;
 import com.metamx.druid.query.timeseries.TimeseriesQueryRunnerTest;
+import io.druid.collections.StupidPool;
+import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.Result;
diff --git a/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java b/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java
index 8636580489c..841f0a7c744 100644
--- a/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java
+++ b/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.metamx.common.guava.Sequences;
-import com.metamx.druid.input.MapBasedInputRow;
+import io.druid.data.input.MapBasedInputRow;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
@@ -32,7 +32,7 @@ import io.druid.query.QueryRunner;
 import io.druid.query.QueryRunnerFactory;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.query.timeseries.TimeseriesQuery;
 import io.druid.query.timeseries.TimeseriesResultValue;
 import io.druid.segment.IncrementalIndexSegment;
diff --git a/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerTest.java b/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerTest.java
index ceea3d448ab..2781ac2fa58 100644
--- a/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerTest.java
+++ b/server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerTest.java
@@ -30,10 +30,10 @@ import io.druid.query.Druids;
 import io.druid.query.QueryRunner;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
+import io.druid.query.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.MaxAggregatorFactory;
+import io.druid.query.aggregation.MinAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
-import io.druid.query.aggregation.aggregation.LongSumAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MaxAggregatorFactory;
-import io.druid.query.aggregation.aggregation.MinAggregatorFactory;
 import io.druid.query.filter.AndDimFilter;
 import io.druid.query.filter.DimFilter;
 import io.druid.query.filter.RegexDimFilter;
diff --git a/server/src/test/java/io/druid/client/DataSegmentTest.java b/server/src/test/java/io/druid/client/DataSegmentTest.java
index fe327f353f0..266da35a29b 100644
--- a/server/src/test/java/io/druid/client/DataSegmentTest.java
+++ b/server/src/test/java/io/druid/client/DataSegmentTest.java
@@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.metamx.druid.jackson.DefaultObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.IndexIO;
 import io.druid.server.shard.shard.NoneShardSpec;
 import io.druid.server.shard.shard.SingleDimensionShardSpec;
diff --git a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
index 5b0b08b2c05..366d2adccfd 100644
--- a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
+++ b/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
@@ -26,12 +26,12 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.metamx.common.ISE;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.BatchServerInventoryView;
 import io.druid.client.DataSegment;
 import io.druid.client.DruidServer;
 import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.announcement.Announcer;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.server.coordination.BatchDataSegmentAnnouncer;
 import io.druid.server.coordination.DruidServerMetadata;
 import io.druid.server.initialization.initialization.BatchDataSegmentAnnouncerConfig;
diff --git a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java b/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java
index 315f53690df..c8f26cf7e07 100644
--- a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java
+++ b/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java
@@ -23,12 +23,12 @@ import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.SettableFuture;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.http.client.HttpClient;
 import com.metamx.http.client.Request;
 import com.metamx.http.client.RequestBuilder;
 import io.druid.client.DataSegment;
 import io.druid.client.DirectDruidClient;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.Druids;
 import io.druid.query.ReflectionQueryToolChestWarehouse;
 import io.druid.query.timeboundary.TimeBoundaryQuery;
diff --git a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java b/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
index 9321385a711..528b0fd77f4 100644
--- a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
+++ b/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
@@ -20,7 +20,7 @@
 package io.druid.curator.announcement;
 
 import com.google.common.collect.Sets;
-import com.metamx.druid.concurrent.Execs;
+import io.druid.concurrent.Execs;
 import io.druid.curator.CuratorTestBase;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.api.CuratorEvent;
diff --git a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java b/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
index 548b1c7e5c9..1c13475912c 100644
--- a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
+++ b/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
@@ -22,7 +22,7 @@ package io.druid.curator.inventory;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
-import com.metamx.druid.concurrent.Execs;
+import io.druid.concurrent.Execs;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.api.CuratorEvent;
 import org.apache.curator.framework.api.CuratorEventType;
diff --git a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
index 1ba6f13c15f..226b35ae20a 100644
--- a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
+++ b/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
@@ -25,10 +25,10 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.metamx.druid.jackson.DefaultObjectMapper;
 import io.druid.client.DataSegment;
 import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.announcement.Announcer;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.server.coordination.BatchDataSegmentAnnouncer;
 import io.druid.server.coordination.DruidServerMetadata;
 import io.druid.server.initialization.initialization.BatchDataSegmentAnnouncerConfig;
diff --git a/server/src/test/java/io/druid/server/shard/shard/NumberedShardSpecTest.java b/server/src/test/java/io/druid/server/shard/shard/NumberedShardSpecTest.java
index 1fc9d01bf87..c40dc086312 100644
--- a/server/src/test/java/io/druid/server/shard/shard/NumberedShardSpecTest.java
+++ b/server/src/test/java/io/druid/server/shard/shard/NumberedShardSpecTest.java
@@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.metamx.druid.jackson.DefaultObjectMapper;
-import com.metamx.druid.partition.PartitionChunk;
+import io.druid.jackson.DefaultObjectMapper;
+import io.druid.timeline.partition.PartitionChunk;
 import junit.framework.Assert;
 import org.junit.Test;
 
diff --git a/server/src/test/java/io/druid/server/shard/shard/SingleDimensionShardSpecTest.java b/server/src/test/java/io/druid/server/shard/shard/SingleDimensionShardSpecTest.java
index a5a9b79e89f..10267585005 100644
--- a/server/src/test/java/io/druid/server/shard/shard/SingleDimensionShardSpecTest.java
+++ b/server/src/test/java/io/druid/server/shard/shard/SingleDimensionShardSpecTest.java
@@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.metamx.common.Pair;
-import com.metamx.druid.input.InputRow;
-import com.metamx.druid.input.MapBasedInputRow;
+import io.druid.data.input.InputRow;
+import io.druid.data.input.MapBasedInputRow;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/services/src/main/java/io/druid/cli/CliPeon.java b/services/src/main/java/io/druid/cli/CliPeon.java
index d424dd5344e..96fe304a7a3 100644
--- a/services/src/main/java/io/druid/cli/CliPeon.java
+++ b/services/src/main/java/io/druid/cli/CliPeon.java
@@ -27,7 +27,6 @@ import com.metamx.druid.indexing.coordinator.ThreadPoolTaskRunner;
 import com.metamx.druid.indexing.worker.executor.ChatHandlerResource;
 import com.metamx.druid.indexing.worker.executor.ExecutorLifecycle;
 import com.metamx.druid.indexing.worker.executor.ExecutorLifecycleConfig;
-import com.metamx.druid.log.LogLevelAdjuster;
 import com.metamx.druid.metrics.MetricsModule;
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
@@ -47,6 +46,7 @@ import io.druid.guice.guice.QueryableModule;
 import io.druid.guice.guice.ServerModule;
 import io.druid.guice.guice.ServerViewModule;
 import io.druid.guice.guice.StorageNodeModule;
+import io.druid.initialization.LogLevelAdjuster;
 import io.druid.server.StatusResource;
 import io.druid.server.initialization.initialization.EmitterModule;
 import io.druid.server.initialization.initialization.Initialization;
diff --git a/services/src/main/java/io/druid/cli/ServerRunnable.java b/services/src/main/java/io/druid/cli/ServerRunnable.java
index a7b6f6c6d4e..a7ba9febbbd 100644
--- a/services/src/main/java/io/druid/cli/ServerRunnable.java
+++ b/services/src/main/java/io/druid/cli/ServerRunnable.java
@@ -1,10 +1,29 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package io.druid.cli;
 
 import com.google.common.base.Throwables;
 import com.google.inject.Injector;
 import com.metamx.common.lifecycle.Lifecycle;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.log.LogLevelAdjuster;
+import io.druid.initialization.LogLevelAdjuster;
 
 /**
  */
diff --git a/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java b/services/src/main/java/io/druid/initialization/LogLevelAdjuster.java
similarity index 96%
rename from common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java
rename to services/src/main/java/io/druid/initialization/LogLevelAdjuster.java
index 87a932f4fb3..5fc125e7bfc 100644
--- a/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java
+++ b/services/src/main/java/io/druid/initialization/LogLevelAdjuster.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.log;
+package io.druid.initialization;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
diff --git a/common/src/main/java/com/metamx/druid/log/LogLevelAdjusterMBean.java b/services/src/main/java/io/druid/initialization/LogLevelAdjusterMBean.java
similarity index 91%
rename from common/src/main/java/com/metamx/druid/log/LogLevelAdjusterMBean.java
rename to services/src/main/java/io/druid/initialization/LogLevelAdjusterMBean.java
index 1a45c183a91..f7a98e0a566 100644
--- a/common/src/main/java/com/metamx/druid/log/LogLevelAdjusterMBean.java
+++ b/services/src/main/java/io/druid/initialization/LogLevelAdjusterMBean.java
@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.log;
+package io.druid.initialization;
 
 /**
  */