diff --git a/BUILD.txt b/BUILD.txt
new file mode 100644
index 0000000..eb1d47a
--- /dev/null
+++ b/BUILD.txt
@@ -0,0 +1,17 @@
+Build instructions for Chukwa
+-----------------------------
+
+Requirements:
+
+Unix System
+JDK 1.8 or later
+Maven 3.3 or later
+Docker 1.8 or later
+
+Building Chukwa distribution:
+
+$ mvn clean package
+
+Run Chukwa
+
+docker run -it -p 4080:4080 chukwa/chukwa
diff --git a/contrib/docker/Dockerfile b/analyzer/Dockerfile
similarity index 94%
rename from contrib/docker/Dockerfile
rename to analyzer/Dockerfile
index 639f251..b35d35c 100644
--- a/contrib/docker/Dockerfile
+++ b/analyzer/Dockerfile
@@ -65,13 +65,13 @@
 RUN chmod 755 /caffe-test/train/train.sh
 RUN chmod 755 /caffe-test/tera/tera.sh
 
-RUN wget https://www.apache.org/dist/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz
-RUN wget https://www.apache.org/dist/hadoop/common/hadoop-2.7.2/hadoop-2.7.2.tar.gz 
+RUN wget https://www.apache.org/dist/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
+RUN wget https://www.apache.org/dist/hadoop/common/hadoop-3.1.0/hadoop-3.1.0.tar.gz 
 RUN wget https://www.apache.org/dist/hbase/1.2.5/hbase-1.2.5-bin.tar.gz
 RUN wget https://www.apache.org/dist/lucene/solr/5.5.4/solr-5.5.4.tgz
 ADD chukwa-0.8.0.tar.gz /opt/apache/
 RUN tar xf zookeeper-3.4.6.tar.gz -C /opt/apache
-RUN tar xf hadoop-2.7.2.tar.gz -C /opt/apache
+RUN tar xf hadoop-3.1.0.tar.gz -C /opt/apache
 RUN tar xf hbase-1.2.5-bin.tar.gz -C /opt/apache
 RUN tar xf solr-5.5.4.tgz -C /opt/apache
 RUN rm -f zookeeper-*.tar.gz hadoop-*.tar.gz hbase-*.tar.gz solr-*.tgz
diff --git a/contrib/docker/Makefile.config b/analyzer/Makefile.config
similarity index 100%
rename from contrib/docker/Makefile.config
rename to analyzer/Makefile.config
diff --git a/contrib/docker/README b/analyzer/README
similarity index 100%
copy from contrib/docker/README
copy to analyzer/README
diff --git a/contrib/docker/config-caffe.sh b/analyzer/config-caffe.sh
similarity index 100%
rename from contrib/docker/config-caffe.sh
rename to analyzer/config-caffe.sh
diff --git a/contrib/docker/hadoop/core-site.xml b/analyzer/hadoop/core-site.xml
similarity index 100%
copy from contrib/docker/hadoop/core-site.xml
copy to analyzer/hadoop/core-site.xml
diff --git a/contrib/docker/hadoop/hadoop-env.sh b/analyzer/hadoop/hadoop-env.sh
similarity index 100%
copy from contrib/docker/hadoop/hadoop-env.sh
copy to analyzer/hadoop/hadoop-env.sh
diff --git a/contrib/docker/hadoop/mapred-site.xml b/analyzer/hadoop/mapred-site.xml
similarity index 100%
copy from contrib/docker/hadoop/mapred-site.xml
copy to analyzer/hadoop/mapred-site.xml
diff --git a/contrib/docker/hadoop/yarn-env.sh b/analyzer/hadoop/yarn-env.sh
similarity index 100%
copy from contrib/docker/hadoop/yarn-env.sh
copy to analyzer/hadoop/yarn-env.sh
diff --git a/contrib/docker/hadoop/yarn-site.xml b/analyzer/hadoop/yarn-site.xml
similarity index 100%
copy from contrib/docker/hadoop/yarn-site.xml
copy to analyzer/hadoop/yarn-site.xml
diff --git a/contrib/docker/hbase/hbase-env.sh b/analyzer/hbase/hbase-env.sh
similarity index 100%
copy from contrib/docker/hbase/hbase-env.sh
copy to analyzer/hbase/hbase-env.sh
diff --git a/contrib/docker/hbase/hbase-site.xml b/analyzer/hbase/hbase-site.xml
similarity index 100%
copy from contrib/docker/hbase/hbase-site.xml
copy to analyzer/hbase/hbase-site.xml
diff --git a/contrib/docker/makeImage.sh b/analyzer/makeImage.sh
similarity index 100%
copy from contrib/docker/makeImage.sh
copy to analyzer/makeImage.sh
diff --git a/analyzer/pom.xml b/analyzer/pom.xml
new file mode 100644
index 0000000..566e11f
--- /dev/null
+++ b/analyzer/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <name>Apache Chukwa Analyzer Docker Image</name>
+    <description>Chukwa Analyzer Docker Image is binary distribution of Chukwa Caffee Tools to run in Apache Hadoop.</description>
+
+    <url>http://chukwa.apache.org/</url>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.chukwa</groupId>
+    <artifactId>chukwa-analyzer</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.apache.chukwa</groupId>
+        <version>0.8.0</version>
+        <artifactId>chukwa</artifactId>
+    </parent>
+
+    <profiles>
+        <profile>
+            <id>ai</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>dockerfile-maven-plugin</artifactId>
+                        <version>1.3.4</version>
+                        <executions>
+                            <execution>
+                                <id>default</id>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <repository>chukwa/chukwa-analyzer</repository>
+                            <tag>${project.version}</tag>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+
diff --git a/contrib/docker/setup-image.sh b/analyzer/setup-image.sh
similarity index 100%
copy from contrib/docker/setup-image.sh
copy to analyzer/setup-image.sh
diff --git a/contrib/docker/start-all.sh b/analyzer/start-all.sh
similarity index 97%
rename from contrib/docker/start-all.sh
rename to analyzer/start-all.sh
index bfb214a..732b4bb 100755
--- a/contrib/docker/start-all.sh
+++ b/analyzer/start-all.sh
@@ -39,4 +39,4 @@
 echo "Username: admin, password: admin"
 echo
 echo "Enjoy!"
-bash
+chukwa --config /etc/chukwa hicc
diff --git a/contrib/docker/tera.sh b/analyzer/tera.sh
similarity index 81%
rename from contrib/docker/tera.sh
rename to analyzer/tera.sh
index ac00f7d..767a15b 100644
--- a/contrib/docker/tera.sh
+++ b/analyzer/tera.sh
@@ -18,8 +18,8 @@
 su hdfs -c "hadoop dfs -mkdir -p /user/hdfs"
 while :
 do
-  su hdfs -c "hadoop jar /opt/apache/hadoop-2.7.2/share/hadoop/mapreduce/hadoop-mapreduce-examples-2.7.2.jar teragen 100 /user/hdfs/terasort-input"
-  su hdfs -c "hadoop jar /opt/apache/hadoop-2.7.2/share/hadoop/mapreduce/hadoop-mapreduce-examples-2.7.2.jar terasort /user/hdfs/terasort-input /user/hdfs/terasort-output"
+  su hdfs -c "hadoop jar /opt/apache/hadoop-3.1.0/share/hadoop/mapreduce/hadoop-mapreduce-examples-3.1.0.jar teragen 100 /user/hdfs/terasort-input"
+  su hdfs -c "hadoop jar /opt/apache/hadoop-3.1.0/share/hadoop/mapreduce/hadoop-mapreduce-examples-3.1.0.jar terasort /user/hdfs/terasort-input /user/hdfs/terasort-output"
   su hdfs -c "hadoop dfs -rmr  -skipTrash /user/hdfs/terasort-input/"
   su hdfs -c "hadoop dfs -rmr  -skipTrash /user/hdfs/terasort-output/"
 done
diff --git a/contrib/docker/test_solver.prototxt b/analyzer/test_solver.prototxt
similarity index 100%
rename from contrib/docker/test_solver.prototxt
rename to analyzer/test_solver.prototxt
diff --git a/contrib/docker/train.sh b/analyzer/train.sh
similarity index 100%
rename from contrib/docker/train.sh
rename to analyzer/train.sh
diff --git a/contrib/docker/train_test.prototxt b/analyzer/train_test.prototxt
similarity index 100%
rename from contrib/docker/train_test.prototxt
rename to analyzer/train_test.prototxt
diff --git a/bin/README b/core/bin/README
similarity index 100%
rename from bin/README
rename to core/bin/README
diff --git a/bin/VERSION b/core/bin/VERSION
similarity index 100%
rename from bin/VERSION
rename to core/bin/VERSION
diff --git a/bin/chukwa b/core/bin/chukwa
similarity index 100%
rename from bin/chukwa
rename to core/bin/chukwa
diff --git a/bin/chukwa-config.sh b/core/bin/chukwa-config.sh
similarity index 100%
rename from bin/chukwa-config.sh
rename to core/bin/chukwa-config.sh
diff --git a/bin/chukwa-daemon.sh b/core/bin/chukwa-daemon.sh
similarity index 100%
rename from bin/chukwa-daemon.sh
rename to core/bin/chukwa-daemon.sh
diff --git a/bin/chukwa-daemons.sh b/core/bin/chukwa-daemons.sh
similarity index 100%
rename from bin/chukwa-daemons.sh
rename to core/bin/chukwa-daemons.sh
diff --git a/bin/dailyRolling.sh b/core/bin/dailyRolling.sh
similarity index 100%
rename from bin/dailyRolling.sh
rename to core/bin/dailyRolling.sh
diff --git a/bin/downSampling.sh b/core/bin/downSampling.sh
similarity index 100%
rename from bin/downSampling.sh
rename to core/bin/downSampling.sh
diff --git a/bin/hourlyRolling.sh b/core/bin/hourlyRolling.sh
similarity index 100%
rename from bin/hourlyRolling.sh
rename to core/bin/hourlyRolling.sh
diff --git a/bin/slaves.sh b/core/bin/slaves.sh
similarity index 100%
rename from bin/slaves.sh
rename to core/bin/slaves.sh
diff --git a/bin/start-agents.sh b/core/bin/start-agents.sh
similarity index 100%
rename from bin/start-agents.sh
rename to core/bin/start-agents.sh
diff --git a/bin/start-chukwa.sh b/core/bin/start-chukwa.sh
similarity index 100%
rename from bin/start-chukwa.sh
rename to core/bin/start-chukwa.sh
diff --git a/bin/start-collectors.sh b/core/bin/start-collectors.sh
similarity index 100%
rename from bin/start-collectors.sh
rename to core/bin/start-collectors.sh
diff --git a/bin/start-data-processors.sh b/core/bin/start-data-processors.sh
similarity index 100%
rename from bin/start-data-processors.sh
rename to core/bin/start-data-processors.sh
diff --git a/bin/stop-agents.sh b/core/bin/stop-agents.sh
similarity index 100%
rename from bin/stop-agents.sh
rename to core/bin/stop-agents.sh
diff --git a/bin/stop-chukwa.sh b/core/bin/stop-chukwa.sh
similarity index 100%
rename from bin/stop-chukwa.sh
rename to core/bin/stop-chukwa.sh
diff --git a/bin/stop-collectors.sh b/core/bin/stop-collectors.sh
similarity index 100%
rename from bin/stop-collectors.sh
rename to core/bin/stop-collectors.sh
diff --git a/bin/stop-data-processors.sh b/core/bin/stop-data-processors.sh
similarity index 100%
rename from bin/stop-data-processors.sh
rename to core/bin/stop-data-processors.sh
diff --git a/conf/README b/core/conf/README
similarity index 100%
rename from conf/README
rename to core/conf/README
diff --git a/conf/agents b/core/conf/agents
similarity index 100%
rename from conf/agents
rename to core/conf/agents
diff --git a/conf/alert b/core/conf/alert
similarity index 100%
rename from conf/alert
rename to core/conf/alert
diff --git a/conf/auth.conf b/core/conf/auth.conf
similarity index 100%
rename from conf/auth.conf
rename to core/conf/auth.conf
diff --git a/conf/chukwa-agent-conf.xml b/core/conf/chukwa-agent-conf.xml
similarity index 100%
rename from conf/chukwa-agent-conf.xml
rename to core/conf/chukwa-agent-conf.xml
diff --git a/conf/chukwa-collector-conf.xml b/core/conf/chukwa-collector-conf.xml
similarity index 100%
rename from conf/chukwa-collector-conf.xml
rename to core/conf/chukwa-collector-conf.xml
diff --git a/conf/chukwa-common.xml b/core/conf/chukwa-common.xml
similarity index 100%
rename from conf/chukwa-common.xml
rename to core/conf/chukwa-common.xml
diff --git a/conf/chukwa-demux-conf.xml b/core/conf/chukwa-demux-conf.xml
similarity index 100%
rename from conf/chukwa-demux-conf.xml
rename to core/conf/chukwa-demux-conf.xml
diff --git a/conf/chukwa-env.sh b/core/conf/chukwa-env.sh
similarity index 100%
rename from conf/chukwa-env.sh
rename to core/conf/chukwa-env.sh
diff --git a/conf/chukwa-log4j.properties b/core/conf/chukwa-log4j.properties
similarity index 100%
rename from conf/chukwa-log4j.properties
rename to core/conf/chukwa-log4j.properties
diff --git a/conf/collectors b/core/conf/collectors
similarity index 100%
rename from conf/collectors
rename to core/conf/collectors
diff --git a/conf/commons-logging.properties b/core/conf/commons-logging.properties
similarity index 100%
rename from conf/commons-logging.properties
rename to core/conf/commons-logging.properties
diff --git a/conf/configuration.xsl b/core/conf/configuration.xsl
similarity index 100%
rename from conf/configuration.xsl
rename to core/conf/configuration.xsl
diff --git a/conf/hadoop-log4j.properties b/core/conf/hadoop-log4j.properties
similarity index 100%
rename from conf/hadoop-log4j.properties
rename to core/conf/hadoop-log4j.properties
diff --git a/conf/hadoop-metrics.properties b/core/conf/hadoop-metrics.properties
similarity index 100%
rename from conf/hadoop-metrics.properties
rename to core/conf/hadoop-metrics.properties
diff --git a/conf/hadoop-metrics2-hbase.properties b/core/conf/hadoop-metrics2-hbase.properties
similarity index 100%
rename from conf/hadoop-metrics2-hbase.properties
rename to core/conf/hadoop-metrics2-hbase.properties
diff --git a/conf/hadoop-metrics2.properties b/core/conf/hadoop-metrics2.properties
similarity index 100%
rename from conf/hadoop-metrics2.properties
rename to core/conf/hadoop-metrics2.properties
diff --git a/conf/hbase-log4j.properties b/core/conf/hbase-log4j.properties
similarity index 100%
rename from conf/hbase-log4j.properties
rename to core/conf/hbase-log4j.properties
diff --git a/conf/hbase.schema b/core/conf/hbase.schema
similarity index 100%
rename from conf/hbase.schema
rename to core/conf/hbase.schema
diff --git a/conf/initial_adaptors b/core/conf/initial_adaptors
similarity index 100%
rename from conf/initial_adaptors
rename to core/conf/initial_adaptors
diff --git a/conf/jmxremote.access b/core/conf/jmxremote.access
similarity index 100%
rename from conf/jmxremote.access
rename to core/conf/jmxremote.access
diff --git a/conf/jmxremote.password b/core/conf/jmxremote.password
similarity index 100%
rename from conf/jmxremote.password
rename to core/conf/jmxremote.password
diff --git a/conf/log4j.properties b/core/conf/log4j.properties
similarity index 100%
rename from conf/log4j.properties
rename to core/conf/log4j.properties
diff --git a/conf/mdl.xml b/core/conf/mdl.xml
similarity index 100%
rename from conf/mdl.xml
rename to core/conf/mdl.xml
diff --git a/conf/nagios.properties b/core/conf/nagios.properties
similarity index 100%
rename from conf/nagios.properties
rename to core/conf/nagios.properties
diff --git a/conf/shiro.ini b/core/conf/shiro.ini
similarity index 100%
rename from conf/shiro.ini
rename to core/conf/shiro.ini
diff --git a/conf/system-data-loader.properties b/core/conf/system-data-loader.properties
similarity index 100%
rename from conf/system-data-loader.properties
rename to core/conf/system-data-loader.properties
diff --git a/contrib/build-contrib.xml b/core/contrib/build-contrib.xml
similarity index 100%
rename from contrib/build-contrib.xml
rename to core/contrib/build-contrib.xml
diff --git a/contrib/build.xml b/core/contrib/build.xml
similarity index 100%
rename from contrib/build.xml
rename to core/contrib/build.xml
diff --git a/contrib/chukwa-pig/build.xml b/core/contrib/chukwa-pig/build.xml
similarity index 100%
rename from contrib/chukwa-pig/build.xml
rename to core/contrib/chukwa-pig/build.xml
diff --git a/contrib/chukwa-pig/chukwa-pig.jar b/core/contrib/chukwa-pig/chukwa-pig.jar
similarity index 100%
rename from contrib/chukwa-pig/chukwa-pig.jar
rename to core/contrib/chukwa-pig/chukwa-pig.jar
Binary files differ
diff --git a/contrib/chukwa-pig/lib/pig-0.7.0-test.jar b/core/contrib/chukwa-pig/lib/pig-0.7.0-test.jar
similarity index 100%
rename from contrib/chukwa-pig/lib/pig-0.7.0-test.jar
rename to core/contrib/chukwa-pig/lib/pig-0.7.0-test.jar
Binary files differ
diff --git a/contrib/chukwa-pig/lib/pig-0.7.0.jar b/core/contrib/chukwa-pig/lib/pig-0.7.0.jar
similarity index 100%
rename from contrib/chukwa-pig/lib/pig-0.7.0.jar
rename to core/contrib/chukwa-pig/lib/pig-0.7.0.jar
Binary files differ
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/ChukwaArchive.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/ChukwaArchive.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/ChukwaArchive.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/ChukwaArchive.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/PARSEDOUBLE.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/PARSEDOUBLE.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/PARSEDOUBLE.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/PARSEDOUBLE.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/RecordMerger.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/RecordMerger.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/RecordMerger.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/RecordMerger.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/TimePartition.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/TimePartition.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/TimePartition.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/TimePartition.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaLoader.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaLoader.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaLoader.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaLoader.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaStorer.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaStorer.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaStorer.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/pig/ChukwaStorer.java
diff --git a/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/tools/PigMover.java b/core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/tools/PigMover.java
similarity index 100%
rename from contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/tools/PigMover.java
rename to core/contrib/chukwa-pig/src/java/org/apache/hadoop/chukwa/tools/PigMover.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/PigTest.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/PigTest.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/PigTest.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/PigTest.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestArchiveReader.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestArchiveReader.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestArchiveReader.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestArchiveReader.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestLocalChukwaStorage.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestLocalChukwaStorage.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestLocalChukwaStorage.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestLocalChukwaStorage.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestParseDouble.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestParseDouble.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestParseDouble.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestParseDouble.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestRecordMerger.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestRecordMerger.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestRecordMerger.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestRecordMerger.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestTimePartition.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestTimePartition.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestTimePartition.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/TestTimePartition.java
diff --git a/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/util/GenerateTestFile.java b/core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/util/GenerateTestFile.java
similarity index 100%
rename from contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/util/GenerateTestFile.java
rename to core/contrib/chukwa-pig/test/src/java/org/apache/hadoop/chukwa/util/GenerateTestFile.java
diff --git a/contrib/solr/chukwa/README.txt b/core/contrib/solr/chukwa/README.txt
similarity index 100%
rename from contrib/solr/chukwa/README.txt
rename to core/contrib/solr/chukwa/README.txt
diff --git a/contrib/xtrace/build.xml b/core/contrib/xtrace/build.xml
similarity index 100%
rename from contrib/xtrace/build.xml
rename to core/contrib/xtrace/build.xml
diff --git a/contrib/xtrace/lib/xtrace-2.0.jar b/core/contrib/xtrace/lib/xtrace-2.0.jar
similarity index 100%
rename from contrib/xtrace/lib/xtrace-2.0.jar
rename to core/contrib/xtrace/lib/xtrace-2.0.jar
Binary files differ
diff --git a/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java b/core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
similarity index 100%
rename from contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
rename to core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
diff --git a/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrAdaptor.java b/core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrAdaptor.java
similarity index 100%
rename from contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrAdaptor.java
rename to core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrAdaptor.java
diff --git a/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrExtract.java b/core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrExtract.java
similarity index 100%
rename from contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrExtract.java
rename to core/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/XtrExtract.java
diff --git a/contrib/xtrace/test/src/java/edu/berkeley/chukwa_xtrace/TestXtrAdaptor.java b/core/contrib/xtrace/test/src/java/edu/berkeley/chukwa_xtrace/TestXtrAdaptor.java
similarity index 100%
rename from contrib/xtrace/test/src/java/edu/berkeley/chukwa_xtrace/TestXtrAdaptor.java
rename to core/contrib/xtrace/test/src/java/edu/berkeley/chukwa_xtrace/TestXtrAdaptor.java
diff --git a/lib/libsigar-amd64-freebsd-6.so b/core/lib/libsigar-amd64-freebsd-6.so
similarity index 100%
rename from lib/libsigar-amd64-freebsd-6.so
rename to core/lib/libsigar-amd64-freebsd-6.so
Binary files differ
diff --git a/lib/libsigar-amd64-linux.so b/core/lib/libsigar-amd64-linux.so
similarity index 100%
rename from lib/libsigar-amd64-linux.so
rename to core/lib/libsigar-amd64-linux.so
Binary files differ
diff --git a/lib/libsigar-amd64-solaris-1.so b/core/lib/libsigar-amd64-solaris-1.so
similarity index 100%
rename from lib/libsigar-amd64-solaris-1.so
rename to core/lib/libsigar-amd64-solaris-1.so
Binary files differ
diff --git a/lib/libsigar-amd64-solaris.so b/core/lib/libsigar-amd64-solaris.so
similarity index 100%
rename from lib/libsigar-amd64-solaris.so
rename to core/lib/libsigar-amd64-solaris.so
Binary files differ
diff --git a/lib/libsigar-ia64-hpux-11.sl b/core/lib/libsigar-ia64-hpux-11.sl
similarity index 100%
rename from lib/libsigar-ia64-hpux-11.sl
rename to core/lib/libsigar-ia64-hpux-11.sl
Binary files differ
diff --git a/lib/libsigar-ia64-linux.so b/core/lib/libsigar-ia64-linux.so
similarity index 100%
rename from lib/libsigar-ia64-linux.so
rename to core/lib/libsigar-ia64-linux.so
Binary files differ
diff --git a/lib/libsigar-pa-hpux-11.sl b/core/lib/libsigar-pa-hpux-11.sl
similarity index 100%
rename from lib/libsigar-pa-hpux-11.sl
rename to core/lib/libsigar-pa-hpux-11.sl
Binary files differ
diff --git a/lib/libsigar-ppc-aix-5.so b/core/lib/libsigar-ppc-aix-5.so
similarity index 100%
rename from lib/libsigar-ppc-aix-5.so
rename to core/lib/libsigar-ppc-aix-5.so
Binary files differ
diff --git a/lib/libsigar-ppc-linux.so b/core/lib/libsigar-ppc-linux.so
similarity index 100%
rename from lib/libsigar-ppc-linux.so
rename to core/lib/libsigar-ppc-linux.so
Binary files differ
diff --git a/lib/libsigar-ppc64-aix-5.so b/core/lib/libsigar-ppc64-aix-5.so
similarity index 100%
rename from lib/libsigar-ppc64-aix-5.so
rename to core/lib/libsigar-ppc64-aix-5.so
Binary files differ
diff --git a/lib/libsigar-ppc64-linux.so b/core/lib/libsigar-ppc64-linux.so
similarity index 100%
rename from lib/libsigar-ppc64-linux.so
rename to core/lib/libsigar-ppc64-linux.so
Binary files differ
diff --git a/lib/libsigar-s390x-linux.so b/core/lib/libsigar-s390x-linux.so
similarity index 100%
rename from lib/libsigar-s390x-linux.so
rename to core/lib/libsigar-s390x-linux.so
Binary files differ
diff --git a/lib/libsigar-sparc-solaris.so b/core/lib/libsigar-sparc-solaris.so
similarity index 100%
rename from lib/libsigar-sparc-solaris.so
rename to core/lib/libsigar-sparc-solaris.so
Binary files differ
diff --git a/lib/libsigar-sparc64-solaris.so b/core/lib/libsigar-sparc64-solaris.so
similarity index 100%
rename from lib/libsigar-sparc64-solaris.so
rename to core/lib/libsigar-sparc64-solaris.so
Binary files differ
diff --git a/lib/libsigar-universal-macosx.dylib b/core/lib/libsigar-universal-macosx.dylib
similarity index 100%
rename from lib/libsigar-universal-macosx.dylib
rename to core/lib/libsigar-universal-macosx.dylib
Binary files differ
diff --git a/lib/libsigar-universal64-macosx.dylib b/core/lib/libsigar-universal64-macosx.dylib
similarity index 100%
rename from lib/libsigar-universal64-macosx.dylib
rename to core/lib/libsigar-universal64-macosx.dylib
Binary files differ
diff --git a/lib/libsigar-x86-freebsd-5.so b/core/lib/libsigar-x86-freebsd-5.so
similarity index 100%
rename from lib/libsigar-x86-freebsd-5.so
rename to core/lib/libsigar-x86-freebsd-5.so
Binary files differ
diff --git a/lib/libsigar-x86-freebsd-6.so b/core/lib/libsigar-x86-freebsd-6.so
similarity index 100%
rename from lib/libsigar-x86-freebsd-6.so
rename to core/lib/libsigar-x86-freebsd-6.so
Binary files differ
diff --git a/lib/libsigar-x86-linux.so b/core/lib/libsigar-x86-linux.so
similarity index 100%
rename from lib/libsigar-x86-linux.so
rename to core/lib/libsigar-x86-linux.so
Binary files differ
diff --git a/lib/libsigar-x86-solaris.so b/core/lib/libsigar-x86-solaris.so
similarity index 100%
rename from lib/libsigar-x86-solaris.so
rename to core/lib/libsigar-x86-solaris.so
Binary files differ
diff --git a/lib/sigar-amd64-winnt.dll b/core/lib/sigar-amd64-winnt.dll
similarity index 100%
rename from lib/sigar-amd64-winnt.dll
rename to core/lib/sigar-amd64-winnt.dll
Binary files differ
diff --git a/lib/sigar-x86-winnt.dll b/core/lib/sigar-x86-winnt.dll
similarity index 100%
rename from lib/sigar-x86-winnt.dll
rename to core/lib/sigar-x86-winnt.dll
Binary files differ
diff --git a/lib/sigar-x86-winnt.lib b/core/lib/sigar-x86-winnt.lib
similarity index 100%
rename from lib/sigar-x86-winnt.lib
rename to core/lib/sigar-x86-winnt.lib
Binary files differ
diff --git a/lib/sigar.jar b/core/lib/sigar.jar
similarity index 100%
rename from lib/sigar.jar
rename to core/lib/sigar.jar
Binary files differ
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000..6c27025
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,1495 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <properties>
+        <buildtype>test</buildtype>
+        <BUILD_NUMBER>${env.BUILD_NUMBER}</BUILD_NUMBER>
+        <VERSION>0.8.0</VERSION>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <package.prefix>/usr</package.prefix>
+        <package.conf.dir>/etc/chukwa</package.conf.dir>
+        <package.log.dir>/var/log/chukwa</package.log.dir>
+        <package.pid.dir>/var/run/chukwa</package.pid.dir>
+        <package.release>1</package.release>
+        <package.version>0.8.0</package.version>
+        <final.name>${project.artifactId}-${package.version}</final.name>
+        <TODO_ALERT_EMAIL>user@example.com</TODO_ALERT_EMAIL>
+        <TODO_CLUSTER_NAME>chukwa</TODO_CLUSTER_NAME>
+        <TODO_COLLECTORS_LOCAL_OUTPUT_DIR>/tmp/chukwa/dataSink/</TODO_COLLECTORS_LOCAL_OUTPUT_DIR>
+        <TODO_COLLECTORS_NAMENODE>hdfs:///</TODO_COLLECTORS_NAMENODE>
+        <TODO_COLLECTORS_ROTATEINTERVAL>300000</TODO_COLLECTORS_ROTATEINTERVAL>
+        <TODO_COLLECTORS_PORT>8080</TODO_COLLECTORS_PORT>
+        <TODO_COLLECTORS_ISFIXEDTIMEROTATORSCHEME>false</TODO_COLLECTORS_ISFIXEDTIMEROTATORSCHEME>
+        <TODO_COLLECTORS_FIXEDTIMEINTERVALOFFSET>30000</TODO_COLLECTORS_FIXEDTIMEINTERVALOFFSET>
+        <TODO_CHUKWA_PID_DIR>/tmp/chukwa/pidDir</TODO_CHUKWA_PID_DIR>
+        <TODO_CHUKWA_LOG_DIR>/tmp/chukwa/log</TODO_CHUKWA_LOG_DIR>
+        <TODO_AGENTS_INSTANCE_NAME>chukwa</TODO_AGENTS_INSTANCE_NAME>
+        <TODO_NAGIOS_SERVER>localhost</TODO_NAGIOS_SERVER>
+        <TODO_DEMUX_IO_SORT_MB>64</TODO_DEMUX_IO_SORT_MB>
+        <TODO_DEMUX_FS_INMEMORY_SIZE_MB>64</TODO_DEMUX_FS_INMEMORY_SIZE_MB>
+        <TODO_DEMUX_IO_SORT_FACTOR>10</TODO_DEMUX_IO_SORT_FACTOR>
+        <CHUKWA_DIR>/chukwa</CHUKWA_DIR>
+        <json-simpleVersion>1.1</json-simpleVersion>
+        <zookeeperVersion>3.4.5</zookeeperVersion>
+        <hbaseVersion>1.2.0</hbaseVersion>
+        <hadoopVersion>2.7.2</hadoopVersion>
+        <solrVersion>5.5.0</solrVersion>
+        <javaVersion>1.8</javaVersion>
+        <!-- <JAVA_HOME>${java.home}</JAVA_HOME> -->
+        <gora.version>0.6</gora.version>
+    </properties>
+
+    <name>Apache Chukwa Core</name>
+    <description>Chukwa is an open source data collection system for monitoring large distributed systems. 
+    Chukwa is built on top of the Hadoop Distributed File System (HDFS) and Map/Reduce framework and 
+    inherits Hadoop’s scalability and robustness. Chukwa also includes a ﬂexible and powerful toolkit 
+    for displaying, monitoring and analyzing results to make the best use of the collected data.</description>
+
+    <url>http://chukwa.apache.org/</url>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.chukwa</groupId>
+        <artifactId>chukwa</artifactId>
+        <version>0.8.0</version>
+    </parent>
+
+    <groupId>org.apache.chukwa</groupId>
+    <artifactId>chukwa-core</artifactId>
+    <packaging>pom</packaging>
+
+    <issueManagement>
+        <system>Chukwa JIRA</system>
+        <url>http://issues.apache.org/jira/browse/CHUKWA</url>
+    </issueManagement>
+
+    <scm>
+      <connection>scm:git:git://git.apache.org/chukwa.git</connection>
+      <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/chukwa.git</developerConnection>
+      <url>https://git-wip-us.apache.org/repos/asf?p=chukwa.git</url>
+    </scm>
+
+    <mailingLists>
+        <mailingList>
+            <name>User list</name>
+            <subscribe>mailto:user-subscribe@chukwa.apache.org</subscribe>
+            <unsubscribe>mailto:user-unsubscribe@chukwa.apache.org</unsubscribe>
+            <post>mailto:user@chukwa.apache.org</post>
+            <archive></archive>
+        </mailingList>
+        <mailingList>
+            <name>Development list</name>
+            <subscribe>mailto:dev-subscribe@chukwa.apache.org</subscribe>
+            <unsubscribe>mailto:dev-unsubscribe@chukwa.apache.org</unsubscribe>
+            <post>mailto:dev@chukwa.apache.org</post>
+            <archive></archive>
+        </mailingList>
+        <mailingList>
+            <name>Commit list</name>
+            <subscribe>mailto:commits-subscribe@chukwa.apache.org</subscribe>
+            <unsubscribe>mailto:commits-unsubscribe@chukwa.apache.org</unsubscribe>
+            <post>mailto:commits@chukwa.apache.org</post>
+            <archive></archive>
+        </mailingList>
+    </mailingLists>
+
+    <dependencies>
+          <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+	    <version>2.1.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+	    <version>1.8.3</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.7</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <version>2.0</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts-tiles</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts-taglib</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts-core</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>com.rubiconproject.oss</groupId>
+            <artifactId>jchronic</artifactId>
+            <version>0.2.6</version>
+          </dependency>
+          <dependency>
+            <groupId>com.github.jsendnsca</groupId>
+            <artifactId>jsendnsca</artifactId>
+            <version>2.1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.fusesource</groupId>
+            <artifactId>sigar</artifactId>
+            <version>1.6.4</version>
+          </dependency>
+          <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>${json-simpleVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.5.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.prefuse</groupId>
+            <artifactId>prefuse</artifactId>
+            <version>beta-20071021</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.7</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>1.4.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+          </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>6.1.26</version>
+          </dependency>
+          <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+          </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+          </dependency>
+          <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+          </dependency>
+          <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>jdiff</groupId>
+            <artifactId>jdiff</artifactId>
+            <version>1.0.9</version>
+          </dependency>
+          <dependency>
+            <groupId>xmlenc</groupId>
+            <artifactId>xmlenc</artifactId>
+            <version>0.52</version>
+          </dependency>
+          <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.10.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${zookeeperVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-bundle</artifactId>
+            <version>1.9</version>
+          </dependency>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>12.0.1</version>
+            <exclusions>
+              <exclusion>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solrVersion}</version>
+            <type>jar</type>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-test-framework</artifactId>
+            <version>${solrVersion}</version>
+            <type>jar</type>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-auth</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-common</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-hdfs</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>1.2.3</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+            <version>1.2.3</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-avro</artifactId>
+            <version>1.7.0</version>
+          </dependency>
+          <!-- BEGINNING OF GORA DEPENDENCIES -->
+          <dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-core</artifactId>
+            <version>${gora.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-hbase</artifactId>
+            <version>${gora.version}</version>
+          </dependency>
+          <!--dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-cassandra</artifactId>
+            <version>${gora.version}</version>
+          </dependency-->
+          <!--dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-mongodb</artifactId>
+            <version>${gora.version}</version>
+          </dependency-->
+          <!--dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-solr</artifactId>
+            <version>${gora.version}</version>
+          </dependency-->
+          <!--dependency>
+            <groupId>org.apache.gora</groupId>
+            <artifactId>gora-accumulo</artifactId>
+            <version>${gora.version}</version>
+          </dependency-->
+          
+          <!-- END OF GORA DEPENDENCIES -->
+    </dependencies>
+
+    <developers>
+        <developer>
+            <id>eyang</id>
+            <name>Eric Yang</name>
+            <email>eyang@apache.org</email>
+            <timezone>-8</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>asrabkin</id>
+            <name>Ariel Rabkin</name>
+            <email>asrabkin@apache.org</email>
+            <timezone>-5</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>billgraham</id>
+            <name>Bill Graham</name>
+            <email>billgraham@apache.org</email>
+            <timezone>-8</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>jboulon</id>
+            <name>Jerome Boulon</name>
+            <email>jboulon@apache.org</email>
+            <timezone>-8</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+    </developers>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/main/web/hicc</directory>
+                <includes>
+                    <include>/WEB-INF/jetty.xml</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-configuration</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/conf</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>conf</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <id>core</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>client</id>
+                        <configuration>
+                            <classifier>client</classifier>
+                            <includes>
+                                <include>**/inputtools/log4j/**/*</include>
+                                <include>**/datacollection/client/**/*</include>
+                                <include>**/chukwa/util/**/*</include>
+                                <include>**/chukwa/datacollection/controller/**/*</include>
+                            </includes>
+                        </configuration>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <executions>
+                  <execution>
+                    <id>default-compile</id>
+                    <phase>compile</phase>
+                    <configuration>
+                      <goals>
+                        <goal>compile</goal>
+                      </goals>
+                      <compilerVersion>1.7</compilerVersion>
+                      <source>1.7</source>
+                      <target>1.7</target>
+                      <excludes>
+                        <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+                      </excludes>
+                    </configuration>
+                  </execution>
+                  <execution>
+                    <id>default-testCompile</id>
+                    <phase>test-compile</phase>
+                    <configuration>
+                      <goals>
+                        <goal>testCompile</goal>
+                      </goals>
+                      <compilerVersion>${javaVersion}</compilerVersion>
+                      <source>${javaVersion}</source>
+                      <target>${javaVersion}</target>
+                      <testExcludes>
+                        <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+                        <exclude>**/TestDemuxManager.java</exclude>
+                        <exclude>**/TestFSMBuilder.java</exclude>
+                      </testExcludes>
+                    </configuration>
+                  </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <argLine>-Xmx1024m -Djava.net.preferIPv4Stack=true -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=${basedir}/target/conf/jmxremote.password -Dcom.sun.management.jmxremote.access.file=${basedir}/target/conf/jmxremote.access -Dcom.sun.management.jmxremote.port=10100</argLine>
+                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+                            <forkMode>pertest</forkMode>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <includes>
+                                <include>**/Test*.java</include>
+                            </includes>
+                            <excludes>
+							    <exclude>**/TestMemoryUsageDetection.java</exclude>
+                                <exclude>**/TestFSMBuilder.java</exclude>
+                                <exclude>**/TestDatabase*.java</exclude>
+                                <exclude>**/TestArchive.java</exclude>
+                                <exclude>**/TestJobLogEntry.java</exclude>
+                                <exclude>**/*$*</exclude>
+			   	<exclude>**/TestClientTrace.java</exclude>
+                            </excludes>
+                            <systemPropertyVariables>
+                                <test.build.dir>${project.build.directory}/test</test.build.dir>
+                                <test.build.data>${project.build.directory}/test/var</test.build.data>
+                                <test.cache.data>${project.build.directory}/test/var/cache</test.cache.data>
+                                <test.debug.data>${project.build.directory}/test/var/debug</test.debug.data>
+                                <test.log.dir>${project.build.directory}/test/var/log</test.log.dir>
+                                <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${project.build.directory}/test</CHUKWA_HOME>
+                            </systemPropertyVariables>
+                            <environmentVariables>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${project.build.directory}/test</CHUKWA_HOME>
+                            </environmentVariables>
+                            <workingDirectory>${project.build.directory}/test-classes</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <argLine>-Xmx1024m</argLine>
+                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+                            <forkMode>pertest</forkMode>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <includes>
+                                <include>**/TestFSMBuilder.java</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/TestDatabase*.java</exclude>
+                                <exclude>**/TestArchive.java</exclude>
+                                <exclude>**/*$*</exclude>
+                            </excludes>
+                            <systemPropertyVariables>
+                                <test.build.data>${project.build.directory}/test/var</test.build.data>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </systemPropertyVariables>
+                            <environmentVariables>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </environmentVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <phase>package</phase>
+                    <warName>hicc</warName>
+                    <warSourceDirectory>src/main/web/hicc</warSourceDirectory>
+                    <webappDirectory>${project.build.directory}/hicc</webappDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-hicc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>build-tarball</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>${final.name}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <descriptors>
+                                <descriptor>src/packages/tarball/all.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>setup</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <target>
+                                <mkdir dir="${basedir}/target"/>
+                                <echo message="${VERSION}" file="${basedir}/target/VERSION"/>
+                                <mkdir dir="${basedir}/target/clover"/>
+                                <chmod dir="${basedir}/target/clover" perm="a+w" />
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>chmod-jmx-file</id>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <target>
+                                <chmod file="${project.build.directory}/conf/jmxremote.password" perm="600" />
+                                <chmod file="${project.build.directory}/conf/jmxremote.access" perm="600" />
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-setup</id>
+                        <phase>generate-test-resources</phase>
+                        <configuration>
+                            <target>
+                                <delete dir="${project.build.directory}/test" />
+                                <mkdir dir="${project.build.directory}/test/conf" />
+                                <mkdir dir="${project.build.directory}/test/var" />
+                                <mkdir dir="${project.build.directory}/test/var/log" />
+                                <mkdir dir="${project.build.directory}/test/var/run" />
+                                <copy todir="${project.build.directory}/test/var/log">
+                                    <fileset dir="${basedir}/test/samples/">
+                                        <include name="*.log" />
+                                    </fileset>
+                                </copy>
+                                <echo message="localhost" file="${project.build.directory}/test/conf/collectors"/>
+                                <copy file="${basedir}/conf/chukwa-common.xml" tofile="${project.build.directory}/test/conf/chukwa-common.xml">
+                                    <filterchain>
+                                        <expandproperties/>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/chukwa-agent-conf.xml" tofile="${project.build.directory}/test/conf/chukwa-agent-conf.xml">
+                                    <filterchain>
+                                        <expandproperties/>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/chukwa-demux-conf.xml" tofile="${project.build.directory}/test/conf/chukwa-demux-conf.xml">
+                                    <filterchain>
+                                        <expandproperties/>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/jmxremote.password" tofile="${project.build.directory}/test/conf/jmxremote.password">
+                                    <filterchain>
+                                        <expandproperties/>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/jmxremote.password" tofile="${project.build.directory}/test/conf/jmxremote.access">
+                                    <filterchain>
+                                        <expandproperties/>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/log4j.properties" tofile="${project.build.directory}/test/conf/log4j.properties"></copy>
+                                <copy file="${basedir}/conf/auth.conf" tofile="${project.build.directory}/test/conf/auth.conf"></copy>
+                                <chmod file="${project.build.directory}/test/conf/jmxremote.password" perm="600" />
+                                <chmod file="${project.build.directory}/test/conf/jmxremote.access" perm="600" />
+                                <copy file="${basedir}/src/test/resources/solr.xml" tofile="${project.build.directory}/test/var/solr.xml"></copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>pre-site</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${project.build.directory}/site" />
+                                <mkdir dir="${basedir}/target/site/apidocs"/>
+                                <exec executable="perl" input="CHANGES.txt" output="${project.build.directory}/site/changes.html" failonerror="true">
+                                    <arg value="src/site/resources/scripts/changes2html.pl" />
+                                </exec>
+                                <copy todir="${project.build.directory}/site">
+                                    <fileset dir="src/site/resources/css" includes="*.css" />
+                                </copy>
+                                <copy todir="${project.build.directory}/site/css">
+                                    <fileset dir="src/main/web/hicc/css" includes="*" />
+                                </copy>
+                                <copy todir="${project.build.directory}/site/js">
+                                    <fileset dir="src/main/web/hicc/js" includes="*" />
+                                </copy>
+                                <copy todir="${project.build.directory}/site/fonts">
+                                    <fileset dir="src/main/web/hicc/fonts" includes="*" />
+                                </copy>
+                                <copy file="src/main/web/hicc/welcome.html" tofile="${project.build.directory}/site/hicc.html" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>0.11</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                  <numUnapprovedLicenses>0</numUnapprovedLicenses>
+                  <excludes>
+  			            <!-- notice files -->
+  			            <exclude>CHANGES.txt</exclude>
+  			            <exclude>README.md</exclude>
+
+  			            <!-- generated files -->
+  			            <exclude>bin/VERSION</exclude>
+  			            <exclude>**/target/**</exclude>
+  			            <exclude>**/.classpath</exclude>
+  			            <exclude>**/.project</exclude>
+  			            <exclude>**/.settings/**</exclude>
+
+  			            <!-- Data files -->
+  			            <exclude>conf/agents</exclude>
+  			            <exclude>conf/alert</exclude>
+  			            <exclude>conf/auth.conf</exclude>
+  			            <exclude>conf/collectors</exclude>
+  			            <exclude>conf/hbase.schema</exclude>
+  			            <exclude>conf/initial_adaptors</exclude>
+  			            <exclude>conf/jmxremote.access</exclude>
+  			            <exclude>conf/jmxremote.password</exclude>
+  			            <exclude>contrib/solr/logs/conf/_schema_analysis_stopwords_english.json</exclude>
+  			            <exclude>contrib/solr/logs/conf/_schema_analysis_synonyms_english.json</exclude>
+  			            <exclude>src/main/web/hicc/descriptors/**</exclude>
+  			            <exclude>src/main/web/hicc/views/**</exclude>
+
+  			            <!-- Test samples -->
+  			            <exclude>src/test/resources/Hadoop18JobHistoryLog.txt</exclude>
+  			            <exclude>src/test/resources/TestJobLog.txt</exclude>
+  			            <exclude>test/samples/ClientTrace.log</exclude>
+  			            <exclude>test/samples/Iostat.log</exclude>
+  			            <exclude>test/samples/JobHistory.log</exclude>
+
+  			            <!-- bsd licensed files -->
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_da.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_de.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_es.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fa.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fi.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fr.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_hi.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_hu.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_it.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_nl.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_no.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_pt.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_ru.txt</exclude>
+  			            <exclude>contrib/solr/logs/conf/lang/stopwords_sv.txt</exclude>
+  			            <exclude>src/main/web/hicc/js/jquery*</exclude>
+  			            <exclude>src/main/web/hicc/home/js/jquery.js</exclude>
+                    <exclude>src/main/web/hicc/css/jquery.circliful.css</exclude>
+  			            <exclude>src/main/web/hicc/css/iui.css</exclude>
+  			            <exclude>src/main/web/hicc/js/behaviour.js</exclude>
+  			            <exclude>src/main/web/hicc/js/heatmap.js</exclude>
+  			            <exclude>src/main/web/hicc/js/iui.js</exclude>
+  			            <exclude>src/main/web/hicc/js/yahoo-dom-event.js</exclude>
+  			            <exclude>src/main/web/hicc/js/treeview-min.js</exclude>
+                    <exclude>src/main/resources/ESAPI.properties</exclude>
+
+  			            <!-- MIT licensed files -->
+  			            <exclude>contrib/solr/logs/conf/velocity/jquery.autocomplete.js</exclude>
+  			            <exclude>src/main/web/hicc/css/flexigrid/flexigrid.css</exclude>
+  			            <exclude>src/main/web/hicc/css/timeline.css</exclude>
+  			            <exclude>src/main/web/hicc/lib/timeline/**</exclude>
+  			            <exclude>lib/agent.dict</exclude>
+  			            <exclude>lib/collector.dict</exclude>
+  			            <exclude>lib/confspellcheck-README</exclude>
+  			            <exclude>lib/json-README.txt</exclude>
+  			            <exclude>src/main/web/hicc/js/ajaxtree.js</exclude>
+  			            <exclude>src/main/web/hicc/js/flexigrid.js</exclude>
+  			            <exclude>src/main/web/hicc/js/flexigrid.pack.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/builder.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/controls.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/dragdrop.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/effects.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/scriptaculous.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/slider.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/sound.js</exclude>
+  			            <exclude>src/main/web/hicc/js/org/tool-man/*</exclude>
+  			            <exclude>src/main/web/hicc/js/timeframe.js</exclude>
+  			            <exclude>src/main/web/hicc/js/workspace/prototype.js</exclude>
+  			            <exclude>src/main/web/hicc/js/jquery.flot.pack.js</exclude>
+  			            <exclude>src/main/web/hicc/js/gsv.js</exclude>
+  			            <exclude>src/main/web/hicc/js/bootstrap.min.js</exclude>
+  			            <exclude>src/main/web/hicc/js/js-cookie.js</exclude>
+  			            <exclude>src/main/web/hicc/css/bootstrap-theme.css.map</exclude>
+  			            <exclude>src/main/web/hicc/css/bootstrap-theme.min.css</exclude>
+  			            <exclude>src/main/web/hicc/css/bootstrap.min.css</exclude>
+  			            <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.svg</exclude>
+  			            <exclude>src/main/web/hicc/home/js/jquery.gridster.min.js</exclude>
+  			            <exclude>src/main/web/hicc/home/js/jquery.gridster.with-extras.min.js</exclude>
+  			            <exclude>src/main/web/hicc/home/css/jquery.gridster.css</exclude>
+  			            <exclude>src/main/web/hicc/home/css/jquery.gridster.min.css</exclude>
+  			            <exclude>src/main/web/hicc/home/js/typeahead.bundle.js</exclude>
+  			            <exclude>src/main/web/hicc/home/js/classie.js</exclude>
+  			            <exclude>src/main/web/hicc/home/js/gnmenu.js</exclude>
+  			            <exclude>src/main/web/hicc/home/js/modernizr.custom.js</exclude>
+                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css</exclude>
+                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css</exclude>
+                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css</exclude>
+                    <exclude>src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js</exclude>
+                    <exclude>src/main/web/hicc/ajax-solr/chukwa/js/require.min.js</exclude>
+                    <exclude>src/main/web/hicc/home/css/select2.min.css</exclude>
+                    <exclude>src/main/web/hicc/home/js/select2.min.js</exclude>
+                    <exclude>src/main/web/hicc/css/font-awesome.min.css</exclude>
+                    <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.*</exclude>
+                    <exclude>src/main/web/hicc/home/css/gridstack.min.css</exclude>
+                    <exclude>src/main/web/hicc/home/js/gridstack.min.*</exclude>
+                    <exclude>src/main/web/hicc/home/js/jquery-ui.js</exclude>
+
+  			            <!-- Creative Commons licensed files -->
+  			            <exclude>src/main/web/hicc/js/autoHeight.js</exclude>
+
+  			            <!-- Public Domain -->
+  			            <exclude>src/main/web/hicc/js/base64.js</exclude>
+  			            <exclude>src/main/web/hicc/js/canvas2image.js</exclude>
+  			            <exclude>src/main/web/hicc/js/json.js</exclude>
+  			            <exclude>src/main/web/hicc/home/fonts/codropsicons/*</exclude>
+  			            <exclude>src/main/web/hicc/home/fonts/ecoicons/*</exclude>
+                                    <exclude>src/main/web/hicc/home/js/lodash.min.js</exclude>
+
+                    <!-- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 -->
+                    <exclude>src/main/web/hicc/css/chartist.css</exclude>
+                    <exclude>src/main/web/hicc/css/chartist.css.map</exclude>
+                    <exclude>src/main/web/hicc/js/chartist.min.js</exclude>
+                    <exclude>src/main/web/hicc/js/chartist.min.js.map</exclude>                    
+                    <exclude>src/main/resources/chukwachunk.json</exclude>                    
+                  </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <extensions>
+          <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh-external</artifactId>
+            <version>1.0</version>
+          </extension>
+        </extensions>
+        <pluginManagement>
+          <plugins>
+            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            <plugin>
+              <groupId>org.eclipse.m2e</groupId>
+              <artifactId>lifecycle-mapping</artifactId>
+              <version>1.0.0</version>
+              <configuration>
+                <lifecycleMappingMetadata>
+                  <pluginExecutions>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <versionRange>[2.10.1,)</versionRange>
+                        <goals>
+                          <goal>javadoc</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore></ignore>
+                      </action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>com.sun.jersey.contribs</groupId>
+                        <artifactId>maven-wadl-plugin</artifactId>
+                        <versionRange>[1.8,)</versionRange>
+                        <goals>
+                          <goal>generate</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore></ignore>
+                      </action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <versionRange>[1.6,)</versionRange>
+                        <goals>
+                          <goal>run</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore></ignore>
+                      </action>
+                    </pluginExecution>
+                  </pluginExecutions>
+                </lifecycleMappingMetadata>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>hudson</id>
+            <activation>
+                <property>
+                    <name>!env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <BUILD_NUMBER>0</BUILD_NUMBER>
+            </properties>
+        </profile>
+        <profile>
+            <id>src</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-release-tarball</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <finalName>chukwa-src-${VERSION}</finalName>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <descriptors>
+                                        <descriptor>src/packages/tarball/src.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin> 
+                        <groupId>org.apache.maven.plugins</groupId> 
+                        <artifactId>maven-install-plugin</artifactId> 
+                        <configuration> 
+                            <createChecksum>true</createChecksum> 
+                        </configuration> 
+                    </plugin> 
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>hbase-1</id>
+            <activation>
+                <property>
+                    <name>!hbase.profile</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-common</artifactId>
+                    <version>${hbaseVersion}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-server</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-json</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-compiler</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-runtime</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-hdfs</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-auth</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-client</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-mapreduce-client-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-yarn-common</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-client</artifactId>
+                    <version>${hbaseVersion}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-server</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-json</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-compiler</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-runtime</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-hdfs</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-server</artifactId>
+                    <version>${hbaseVersion}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-server</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-json</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-compiler</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-runtime</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-hdfs</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-common</artifactId>
+                    <classifier>tests</classifier>
+                    <version>${hbaseVersion}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-server</artifactId>
+                    <classifier>tests</classifier>
+                    <version>${hbaseVersion}</version>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-server</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.sun.jersey</groupId>
+                            <artifactId>jersey-json</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-compiler</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-runtime</artifactId>
+                        </exclusion>
+                   </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-hadoop-compat</artifactId>
+                    <classifier>tests</classifier>
+                    <version>${hbaseVersion}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>hbase-hadoop2-compat</artifactId>
+                    <classifier>tests</classifier>
+                    <version>${hbaseVersion}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                    <version>${hadoopVersion}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.servlet.jsp</groupId>
+                            <artifactId>jsp-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-compiler</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>tomcat</groupId>
+                            <artifactId>jasper-runtime</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-mapper-asl</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-auth</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-mapreduce-client-core</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-common</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-server-tests</artifactId>
+                    <version>${hadoopVersion}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+	            <artifactId>hadoop-minicluster</artifactId>
+                    <version>${hadoopVersion}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+          <id>docs</id>
+          <activation>
+            <file>
+              <exists>/usr/bin/xsltproc</exists>
+            </file>
+          </activation>
+          <build>
+            <plugins>
+              <!--  Generate HTML version of REST API document  -->
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.3</version>
+                <dependencies>
+                  <dependency><!-- add support for ssh/scp -->
+                    <groupId>org.apache.maven.wagon</groupId>
+                    <artifactId>wagon-ssh</artifactId>
+                    <version>1.0</version>
+                  </dependency>
+                </dependencies>
+              </plugin>
+            </plugins>
+          </build>
+          <dependencies>
+            <dependency>
+              <groupId>com.sun.jersey.contribs</groupId>
+              <artifactId>maven-wadl-plugin</artifactId>
+              <version>1.8</version>
+              <exclusions>
+                <exclusion>
+                  <groupId>org.apache.maven</groupId>
+                  <artifactId>apache-maven</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.maven</groupId>
+                  <artifactId>maven-artifact</artifactId>
+                </exclusion>
+              </exclusions>
+            </dependency>
+            <dependency>
+              <groupId>com.sun.jersey.contribs</groupId>
+              <artifactId>wadl-resourcedoc-doclet</artifactId>
+              <version>1.8</version>
+            </dependency>
+          </dependencies>
+        </profile>
+    </profiles>
+
+    <repositories>
+        <repository>
+            <id>maven-central</id>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>clojars</id>
+            <url>http://clojars.org/repo/</url>
+        </repository>
+        <repository>
+            <id>Apache</id>
+            <url>http://repo.maven.apache.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>pentaho</id>
+            <url>http://repository.pentaho.org/artifactory/repo/</url>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+        </dependencies>
+    </dependencyManagement>
+
+    <reporting>
+      <plugins>
+        <plugin>
+            <artifactId>maven-jxr-plugin</artifactId>
+            <version>2.3</version>
+        </plugin>
+        <plugin>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <version>3.4</version>
+            <reportSets>
+                <reportSet>
+                    <reports>
+                        <report>pmd</report>
+                        <report>cpd</report>
+                    </reports>
+                </reportSet>
+            </reportSets>
+            <configuration>
+                <targetJdk>1.7</targetJdk>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <version>3.0.1</version>
+            <configuration>
+                <threshold>Normal</threshold>
+                <effort>Max</effort>
+            </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.9</version>
+          <configuration>
+            <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+          </configuration>
+          <reportSets>
+            <reportSet>
+              <reports>
+                <report>dependencies</report>
+              </reports>
+            </reportSet>
+          </reportSets>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.8</version>
+          <reportSets>
+            <reportSet>
+              <id>javadoc</id>
+              <configuration>
+                <aggregate>true</aggregate>
+                <doctitle>${project.name} API ${project.version}</doctitle>
+                <show>public</show>
+                <tags>
+                  <tag>
+                    <name>response.representation.200.doc</name>
+                    <placement>a</placement>
+                    <head>response.representation.200.doc</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.200.mediaType</name>
+                    <placement>a</placement>
+                    <head>response.representation.200.mediaType</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.200.example</name>
+                    <placement>a</placement>
+                    <head>response.representation.200.example</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.400.doc</name>
+                    <placement>a</placement>
+                    <head>response.representation.400.doc</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.400.mediaType</name>
+                    <placement>a</placement>
+                    <head>response.representation.400.mediaType</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.400.example</name>
+                    <placement>a</placement>
+                    <head>response.representation.400.example</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.403.doc</name>
+                    <placement>a</placement>
+                    <head>response.representation.403.doc</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.403.mediaType</name>
+                    <placement>a</placement>
+                    <head>response.representation.403.mediaType</head>
+                  </tag>
+                  <tag>
+                    <name>response.representation.403.example</name>
+                    <placement>a</placement>
+                    <head>response.representation.403.example</head>
+                  </tag>
+                  <tag>
+                    <name>request.representation.example</name>
+                    <placement>a</placement>
+                    <head>request.representation.example</head>
+                  </tag>
+                </tags>
+              </configuration>
+              <reports>
+                <report>javadoc</report>
+              </reports>
+            </reportSet>
+          </reportSets>
+        </plugin>
+      </plugins>
+    </reporting>
+
+    <distributionManagement>
+      <site>
+        <id>apache-website</id>
+        <name>Apache Website</name>
+        <url>scp://people.apache.org/www/chukwa.apache.org/content/docs/r${project.version}</url>
+      </site>
+      <repository>
+        <id>apache-repository</id>
+        <url>scpexe://people.apache.org//www/www.apache.org/dist/chukwa</url>
+      </repository>
+    </distributionManagement>
+
+</project>
+
diff --git a/script/pig/ClusterSummary.pig b/core/script/pig/ClusterSummary.pig
similarity index 100%
rename from script/pig/ClusterSummary.pig
rename to core/script/pig/ClusterSummary.pig
diff --git a/script/pig/Df.pig b/core/script/pig/Df.pig
similarity index 100%
rename from script/pig/Df.pig
rename to core/script/pig/Df.pig
diff --git a/script/pig/Hadoop_dfs_FSDirectory.pig b/core/script/pig/Hadoop_dfs_FSDirectory.pig
similarity index 100%
rename from script/pig/Hadoop_dfs_FSDirectory.pig
rename to core/script/pig/Hadoop_dfs_FSDirectory.pig
diff --git a/script/pig/Hadoop_dfs_FSNamesystem.pig b/core/script/pig/Hadoop_dfs_FSNamesystem.pig
similarity index 100%
rename from script/pig/Hadoop_dfs_FSNamesystem.pig
rename to core/script/pig/Hadoop_dfs_FSNamesystem.pig
diff --git a/script/pig/Hadoop_dfs_datanode.pig b/core/script/pig/Hadoop_dfs_datanode.pig
similarity index 100%
rename from script/pig/Hadoop_dfs_datanode.pig
rename to core/script/pig/Hadoop_dfs_datanode.pig
diff --git a/script/pig/Hadoop_dfs_namenode.pig b/core/script/pig/Hadoop_dfs_namenode.pig
similarity index 100%
rename from script/pig/Hadoop_dfs_namenode.pig
rename to core/script/pig/Hadoop_dfs_namenode.pig
diff --git a/script/pig/Hadoop_jvm_metrics.pig b/core/script/pig/Hadoop_jvm_metrics.pig
similarity index 100%
rename from script/pig/Hadoop_jvm_metrics.pig
rename to core/script/pig/Hadoop_jvm_metrics.pig
diff --git a/script/pig/Hadoop_mapred_jobtracker.pig b/core/script/pig/Hadoop_mapred_jobtracker.pig
similarity index 100%
rename from script/pig/Hadoop_mapred_jobtracker.pig
rename to core/script/pig/Hadoop_mapred_jobtracker.pig
diff --git a/script/pig/Hadoop_rpc_metrics.pig b/core/script/pig/Hadoop_rpc_metrics.pig
similarity index 100%
rename from script/pig/Hadoop_rpc_metrics.pig
rename to core/script/pig/Hadoop_rpc_metrics.pig
diff --git a/script/pig/SystemMetrics.pig b/core/script/pig/SystemMetrics.pig
similarity index 100%
rename from script/pig/SystemMetrics.pig
rename to core/script/pig/SystemMetrics.pig
diff --git a/script/pig/UserDailySummary.pig b/core/script/pig/UserDailySummary.pig
similarity index 100%
rename from script/pig/UserDailySummary.pig
rename to core/script/pig/UserDailySummary.pig
diff --git a/src/docs/forrest.properties b/core/src/docs/forrest.properties
similarity index 100%
rename from src/docs/forrest.properties
rename to core/src/docs/forrest.properties
diff --git a/src/docs/overview.html b/core/src/docs/overview.html
similarity index 100%
rename from src/docs/overview.html
rename to core/src/docs/overview.html
diff --git a/src/docs/releasenotes.html b/core/src/docs/releasenotes.html
similarity index 100%
rename from src/docs/releasenotes.html
rename to core/src/docs/releasenotes.html
diff --git a/src/docs/src/documentation/README.txt b/core/src/docs/src/documentation/README.txt
similarity index 100%
rename from src/docs/src/documentation/README.txt
rename to core/src/docs/src/documentation/README.txt
diff --git a/src/docs/src/documentation/classes/CatalogManager.properties b/core/src/docs/src/documentation/classes/CatalogManager.properties
similarity index 100%
rename from src/docs/src/documentation/classes/CatalogManager.properties
rename to core/src/docs/src/documentation/classes/CatalogManager.properties
diff --git a/src/docs/src/documentation/conf/cli.xconf b/core/src/docs/src/documentation/conf/cli.xconf
similarity index 100%
rename from src/docs/src/documentation/conf/cli.xconf
rename to core/src/docs/src/documentation/conf/cli.xconf
diff --git a/src/docs/src/documentation/content/locationmap.xml b/core/src/docs/src/documentation/content/locationmap.xml
similarity index 100%
rename from src/docs/src/documentation/content/locationmap.xml
rename to core/src/docs/src/documentation/content/locationmap.xml
diff --git a/src/docs/src/documentation/content/xdocs/v0.1.2/admin.xml b/core/src/docs/src/documentation/content/xdocs/v0.1.2/admin.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/v0.1.2/admin.xml
rename to core/src/docs/src/documentation/content/xdocs/v0.1.2/admin.xml
diff --git a/src/docs/src/documentation/content/xdocs/v0.1.2/index.xml b/core/src/docs/src/documentation/content/xdocs/v0.1.2/index.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/v0.1.2/index.xml
rename to core/src/docs/src/documentation/content/xdocs/v0.1.2/index.xml
diff --git a/src/docs/src/documentation/skinconf.xml b/core/src/docs/src/documentation/skinconf.xml
similarity index 100%
rename from src/docs/src/documentation/skinconf.xml
rename to core/src/docs/src/documentation/skinconf.xml
diff --git a/src/main/java/org/apache/hadoop/chukwa/ChukwaArchiveKey.java b/core/src/main/java/org/apache/hadoop/chukwa/ChukwaArchiveKey.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/ChukwaArchiveKey.java
rename to core/src/main/java/org/apache/hadoop/chukwa/ChukwaArchiveKey.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/Chunk.java b/core/src/main/java/org/apache/hadoop/chukwa/Chunk.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/Chunk.java
rename to core/src/main/java/org/apache/hadoop/chukwa/Chunk.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/ChunkBuilder.java b/core/src/main/java/org/apache/hadoop/chukwa/ChunkBuilder.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/ChunkBuilder.java
rename to core/src/main/java/org/apache/hadoop/chukwa/ChunkBuilder.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/ChunkImpl.java b/core/src/main/java/org/apache/hadoop/chukwa/ChunkImpl.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/ChunkImpl.java
rename to core/src/main/java/org/apache/hadoop/chukwa/ChunkImpl.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMBuilder.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMBuilder.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMBuilder.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMBuilder.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntry.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntry.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntry.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntry.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntryPartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntryPartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntryPartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMIntermedEntryPartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMType.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMType.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMType.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/FSMType.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/HDFSState.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/HDFSState.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/HDFSState.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/HDFSState.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/JobHistoryTaskDataMapper.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/JobHistoryTaskDataMapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/JobHistoryTaskDataMapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/JobHistoryTaskDataMapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/MapRedState.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/MapRedState.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/MapRedState.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/MapRedState.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/ParseUtilities.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/ParseUtilities.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/ParseUtilities.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/ParseUtilities.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/StateType.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/StateType.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/StateType.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/StateType.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TaskTrackerClientTraceMapper.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TaskTrackerClientTraceMapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TaskTrackerClientTraceMapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TaskTrackerClientTraceMapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Heatmap.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Heatmap.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Heatmap.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Heatmap.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Swimlanes.java b/core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Swimlanes.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Swimlanes.java
rename to core/src/main/java/org/apache/hadoop/chukwa/analysis/salsa/visualization/Swimlanes.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java b/core/src/main/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java
rename to core/src/main/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/Aggregator.java b/core/src/main/java/org/apache/hadoop/chukwa/database/Aggregator.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/Aggregator.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/Aggregator.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/DataExpiration.java b/core/src/main/java/org/apache/hadoop/chukwa/database/DataExpiration.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/DataExpiration.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/DataExpiration.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java b/core/src/main/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/Macro.java b/core/src/main/java/org/apache/hadoop/chukwa/database/Macro.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/Macro.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/Macro.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/MetricsAggregation.java b/core/src/main/java/org/apache/hadoop/chukwa/database/MetricsAggregation.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/MetricsAggregation.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/MetricsAggregation.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/database/TableCreator.java b/core/src/main/java/org/apache/hadoop/chukwa/database/TableCreator.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/database/TableCreator.java
rename to core/src/main/java/org/apache/hadoop/chukwa/database/TableCreator.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkQueue.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkQueue.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkQueue.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkQueue.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkReceiver.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkReceiver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkReceiver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/ChunkReceiver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/DataFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/DataFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/DataFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/DataFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/OffsetStatsManager.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/OffsetStatsManager.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/OffsetStatsManager.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/OffsetStatsManager.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractWrapper.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractWrapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractWrapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AbstractWrapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/Adaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/Adaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/Adaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/Adaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorException.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorShutdownPolicy.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorShutdownPolicy.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorShutdownPolicy.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/AdaptorShutdownPolicy.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/DirTailingAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/DirTailingAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/DirTailingAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/DirTailingAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/FileAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/FileAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/FileAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/FileAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/HeartbeatAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/HeartbeatAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/HeartbeatAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/HeartbeatAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMXAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMXAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMXAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMXAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/MemBuffered.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/MemBuffered.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/MemBuffered.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/MemBuffered.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/NotifyOnCommitAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/NotifyOnCommitAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/NotifyOnCommitAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/NotifyOnCommitAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/OozieAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/OozieAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/OozieAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/OozieAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RegExDirTailingAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RegExDirTailingAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RegExDirTailingAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RegExDirTailingAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RestAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RestAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RestAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/RestAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SocketAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SocketAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SocketAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SocketAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SyslogAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SyslogAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SyslogAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/SyslogAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/UDPAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/UDPAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/UDPAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/UDPAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/WriteaheadBuffered.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/WriteaheadBuffered.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/WriteaheadBuffered.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/WriteaheadBuffered.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8NewLineEscaped.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8NewLineEscaped.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8NewLineEscaped.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/CharFileTailingAdaptorUTF8NewLineEscaped.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptorPreserveLines.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptorPreserveLines.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptorPreserveLines.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailingAdaptorPreserveLines.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/LWFTAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/LWFTAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/LWFTAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/LWFTAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/RCheckFTAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/RCheckFTAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/RCheckFTAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/RCheckFTAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TerminatorThread.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TerminatorThread.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TerminatorThread.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TerminatorThread.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/ChukwaStatusChecker.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/ChukwaStatusChecker.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/ChukwaStatusChecker.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/ChukwaStatusChecker.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/HttpStatusChecker.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/HttpStatusChecker.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/HttpStatusChecker.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/HttpStatusChecker.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusChecker.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusChecker.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusChecker.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusChecker.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusCheckerException.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusCheckerException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusCheckerException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/heartbeat/StatusCheckerException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessagePropertyTransformer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessagePropertyTransformer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessagePropertyTransformer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessagePropertyTransformer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessageTransformer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessageTransformer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessageTransformer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSMessageTransformer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSTextMessageTransformer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSTextMessageTransformer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSTextMessageTransformer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/JMSTextMessageTransformer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SigarRunner.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SigarRunner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SigarRunner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SigarRunner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SystemMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SystemMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SystemMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/sigar/SystemMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorManager.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorManager.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorManager.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorManager.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorResetThread.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorResetThread.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorResetThread.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AdaptorResetThread.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaConstants.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaConstants.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaConstants.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaConstants.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaRestServer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaRestServer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaRestServer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaRestServer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/MemLimitQueue.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/MemLimitQueue.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/MemLimitQueue.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/MemLimitQueue.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/NonBlockingMemLimitQueue.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/NonBlockingMemLimitQueue.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/NonBlockingMemLimitQueue.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/NonBlockingMemLimitQueue.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/WaitingQueue.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/WaitingQueue.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/WaitingQueue.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/WaitingQueue.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentActivityMBean.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentActivityMBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentActivityMBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentActivityMBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/AgentMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueActivityMBean.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueActivityMBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueActivityMBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueActivityMBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/metrics/ChunkQueueMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorAveragedRate.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorAveragedRate.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorAveragedRate.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorAveragedRate.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorConfig.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorConfig.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorConfig.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorConfig.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorController.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorInfo.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorInfo.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorInfo.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorInfo.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorList.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorList.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorList.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/AdaptorList.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/ContextProvider.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/ContextProvider.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/ContextProvider.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/ContextProvider.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/Examples.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/Examples.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/Examples.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/rest/Examples.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletDiagnostics.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletDiagnostics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletDiagnostics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletDiagnostics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/Connector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/Connector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/connector/Connector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/Connector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/PipelineConnector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/PipelineConnector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/connector/PipelineConnector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/PipelineConnector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ClientFinalizer.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ClientFinalizer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ClientFinalizer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ClientFinalizer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/AsyncAckSender.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/AsyncAckSender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/AsyncAckSender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/AsyncAckSender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaSender.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaSender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaSender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaSender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderActivityMBean.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderActivityMBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderActivityMBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderActivityMBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/sender/metrics/HttpSenderMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/test/ConsoleOutConnector.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/ConsoleOutConnector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/test/ConsoleOutConnector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/ConsoleOutConnector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FileTailerStressTest.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FileTailerStressTest.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/test/FileTailerStressTest.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FileTailerStressTest.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/test/SinkFileValidator.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/SinkFileValidator.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/test/SinkFileValidator.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/test/SinkFileValidator.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ChukwaWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ChukwaWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ChukwaWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ChukwaWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ClientAck.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ClientAck.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ClientAck.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ClientAck.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ConsoleWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ConsoleWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ConsoleWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ConsoleWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ExtractorWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ExtractorWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ExtractorWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ExtractorWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/HttpWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/HttpWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/HttpWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/HttpWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/InMemoryWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/InMemoryWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/InMemoryWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/InMemoryWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/NullWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/NullWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/NullWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/NullWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineStageWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineStageWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineStageWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineStageWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/WriterException.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/WriterException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/WriterException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/WriterException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/ChukwaChunk.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/ChukwaChunk.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/ChukwaChunk.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/ChukwaChunk.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/GoraWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/GoraWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/GoraWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/GoraWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/package-info.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/package-info.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/package-info.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/gora/package-info.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Annotation.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Annotation.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Annotation.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Annotation.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/HBaseWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/HBaseWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/HBaseWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/HBaseWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaAvroSchema.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaAvroSchema.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaAvroSchema.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaAvroSchema.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaParquetWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaParquetWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaParquetWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/parquet/ChukwaParquetWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/solr/SolrWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/solr/SolrWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datacollection/writer/solr/SolrWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/solr/SolrWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/dataloader/DataLoaderFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/dataloader/DataLoaderFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/dataloader/DataLoaderFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/dataloader/DataLoaderFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/dataloader/FSMDataLoader.java b/core/src/main/java/org/apache/hadoop/chukwa/dataloader/FSMDataLoader.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/dataloader/FSMDataLoader.java
rename to core/src/main/java/org/apache/hadoop/chukwa/dataloader/FSMDataLoader.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java b/core/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
rename to core/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoaderPool.java b/core/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoaderPool.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoaderPool.java
rename to core/src/main/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoaderPool.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/dataloader/SocketDataLoader.java b/core/src/main/java/org/apache/hadoop/chukwa/dataloader/SocketDataLoader.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/dataloader/SocketDataLoader.java
rename to core/src/main/java/org/apache/hadoop/chukwa/dataloader/SocketDataLoader.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java b/core/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java b/core/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java b/core/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java b/core/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datatrigger/HttpTriggerAction.java b/core/src/main/java/org/apache/hadoop/chukwa/datatrigger/HttpTriggerAction.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datatrigger/HttpTriggerAction.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datatrigger/HttpTriggerAction.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerAction.java b/core/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerAction.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerAction.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerAction.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerEvent.java b/core/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerEvent.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerEvent.java
rename to core/src/main/java/org/apache/hadoop/chukwa/datatrigger/TriggerEvent.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyOutputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyOutputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyOutputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyOutputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyPartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyPartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyPartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDailyPartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypeOutputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypeOutputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypeOutputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypeOutputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypePartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypePartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypePartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveDataTypePartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyOutputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyOutputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyOutputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyOutputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyPartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyPartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyPartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveHourlyPartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNameOutputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNameOutputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNameOutputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNameOutputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNamePartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNamePartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNamePartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveStreamNamePartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/archive/SinkArchiver.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/SinkArchiver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/archive/SinkArchiver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/archive/SinkArchiver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordOutputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordOutputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordOutputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordOutputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordPartitioner.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordPartitioner.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordPartitioner.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/ChukwaRecordPartitioner.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveOrMergeRecordFile.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveOrMergeRecordFile.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveOrMergeRecordFile.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveOrMergeRecordFile.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveToRepository.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveToRepository.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveToRepository.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/MoveToRepository.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/RecordMerger.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/RecordMerger.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/RecordMerger.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/RecordMerger.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/TaggerPlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/TaggerPlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/TaggerPlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/TaggerPlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/ChukwaOutputCollector.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/ChukwaOutputCollector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/ChukwaOutputCollector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/ChukwaOutputCollector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/Util.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/Util.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/Util.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/Util.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/AbstractProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/AbstractProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/AbstractProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/AbstractProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaMetricsProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaMetricsProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaMetricsProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaMetricsProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkSaver.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkSaver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkSaver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChunkSaver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ClientTraceProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ClientTraceProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ClientTraceProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ClientTraceProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DatanodeProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DatanodeProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DatanodeProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DatanodeProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DebugOutputProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DebugOutputProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DebugOutputProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DebugOutputProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DefaultProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DefaultProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DefaultProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DefaultProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DuplicateProcessorException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DuplicateProcessorException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DuplicateProcessorException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/DuplicateProcessorException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseMasterProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseMasterProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseMasterProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseMasterProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseRegionServerProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseRegionServerProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseRegionServerProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HBaseRegionServerProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopLogProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopLogProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopLogProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopLogProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JPluginMapper.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JPluginMapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JPluginMapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JPluginMapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobConfProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobConfProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobConfProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobConfProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLogHistoryProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLogHistoryProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLogHistoryProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLogHistoryProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobSummary.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobSummary.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobSummary.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobSummary.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobTrackerProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobTrackerProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobTrackerProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobTrackerProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4JMetricsContextProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4JMetricsContextProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4JMetricsContextProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4JMetricsContextProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4jJobHistoryProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4jJobHistoryProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4jJobHistoryProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Log4jJobHistoryProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/LogEntry.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/LogEntry.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/LogEntry.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/LogEntry.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessorFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessorFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessorFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MapProcessorFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/NamenodeProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/NamenodeProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/NamenodeProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/NamenodeProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ProcessorFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ProcessorFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ProcessorFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ProcessorFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SysLog.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SysLog.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SysLog.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SysLog.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SystemMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SystemMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SystemMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/SystemMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TsProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TsProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TsProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TsProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/UnknownRecordTypeException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/UnknownRecordTypeException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/UnknownRecordTypeException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/UnknownRecordTypeException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ZookeeperProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ZookeeperProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ZookeeperProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ZookeeperProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ClientTrace.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ClientTrace.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ClientTrace.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ClientTrace.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/DuplicateReduceProcessorException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/DuplicateReduceProcessorException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/DuplicateReduceProcessorException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/DuplicateReduceProcessorException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/IdentityReducer.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/IdentityReducer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/IdentityReducer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/IdentityReducer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/JobLogHistoryReduceProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/JobLogHistoryReduceProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/JobLogHistoryReduceProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/JobLogHistoryReduceProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MRJobReduceProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MRJobReduceProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MRJobReduceProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MRJobReduceProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessorFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessorFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessorFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/ReduceProcessorFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/SystemMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/SystemMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/SystemMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/SystemMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/UnknownReduceTypeException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/UnknownReduceTypeException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/UnknownReduceTypeException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/UnknownReduceTypeException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecord.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecord.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecord.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecord.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordJT.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordJT.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordJT.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordJT.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordKey.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordKey.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordKey.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaRecordKey.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchResult.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchResult.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchResult.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchResult.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchService.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchService.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchService.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/ChukwaSearchService.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Record.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Record.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/Record.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Record.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/RecordUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/RecordUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/RecordUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/RecordUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchResult.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchResult.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchResult.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchResult.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchService.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchService.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchService.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/SearchService.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Token.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Token.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/Token.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/Token.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSource.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSource.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSource.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSource.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DataSourceFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/database/DatabaseDS.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/database/DatabaseDS.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/database/DatabaseDS.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/database/DatabaseDS.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaDSInternalResult.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaDSInternalResult.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaDSInternalResult.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaDSInternalResult.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaFileParser.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaFileParser.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaFileParser.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaFileParser.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaRecordDataSource.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaRecordDataSource.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaRecordDataSource.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaRecordDataSource.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaSequenceFileParser.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaSequenceFileParser.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaSequenceFileParser.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/ChukwaSequenceFileParser.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/MalformedFileFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/MalformedFileFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/MalformedFileFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/MalformedFileFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/RecordDS.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/RecordDS.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/RecordDS.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/engine/datasource/record/RecordDS.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/AbstractProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/AbstractProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/AbstractProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/AbstractProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ChukwaMetricsProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ChukwaMetricsProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ChukwaMetricsProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ChukwaMetricsProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/DefaultProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/DefaultProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/DefaultProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/DefaultProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/HadoopMetricsProcessor.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/HadoopMetricsProcessor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/HadoopMetricsProcessor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/HadoopMetricsProcessor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/LogEntry.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/LogEntry.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/LogEntry.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/LogEntry.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ProcessorFactory.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ProcessorFactory.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ProcessorFactory.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/ProcessorFactory.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/SystemMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/SystemMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/SystemMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/SystemMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/UnknownRecordTypeException.java b/core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/UnknownRecordTypeException.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/extraction/hbase/UnknownRecordTypeException.java
rename to core/src/main/java/org/apache/hadoop/chukwa/extraction/hbase/UnknownRecordTypeException.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/AreaCalculator.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/AreaCalculator.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/AreaCalculator.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/AreaCalculator.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/ClusterConfig.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/ClusterConfig.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/ClusterConfig.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/ClusterConfig.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/ColorPicker.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/ColorPicker.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/ColorPicker.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/ColorPicker.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Config.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/Config.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/Config.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/Config.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/DatasetMapper.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/DatasetMapper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/DatasetMapper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/DatasetMapper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/ImageSlicer.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/ImageSlicer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/ImageSlicer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/ImageSlicer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/JSONLoader.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/JSONLoader.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/JSONLoader.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/JSONLoader.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/OfflineTimeHandler.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/OfflineTimeHandler.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/OfflineTimeHandler.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/OfflineTimeHandler.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/TimeHandler.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/TimeHandler.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/TimeHandler.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/TimeHandler.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Views.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/Views.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/Views.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/Views.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/ViewsTag.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/ViewsTag.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/ViewsTag.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/ViewsTag.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/BarOptions.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/BarOptions.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/BarOptions.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/BarOptions.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Chart.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Chart.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/Chart.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Chart.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/ChartType.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/ChartType.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/ChartType.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/ChartType.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Dashboard.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Dashboard.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/Dashboard.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Dashboard.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/HeatMapPoint.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/HeatMapPoint.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/HeatMapPoint.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/HeatMapPoint.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Heatmap.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Heatmap.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/Heatmap.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Heatmap.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/LineOptions.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/LineOptions.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/LineOptions.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/LineOptions.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/PointOptions.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/PointOptions.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/PointOptions.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/PointOptions.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Series.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Series.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/Series.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Series.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesMetaData.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesMetaData.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesMetaData.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesMetaData.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesOptions.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesOptions.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesOptions.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SeriesOptions.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SessionAttribute.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SessionAttribute.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/SessionAttribute.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/SessionAttribute.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Widget.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Widget.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/bean/Widget.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/bean/Widget.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/proxy/HttpProxy.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/proxy/HttpProxy.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/proxy/HttpProxy.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/proxy/HttpProxy.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/ChartController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/ChartController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/ChartController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/ChartController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/CirclesController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/CirclesController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/CirclesController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/CirclesController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/Examples.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/Examples.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/Examples.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/Examples.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/HeatmapController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/HeatmapController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/HeatmapController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/HeatmapController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/LoginController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/LoginController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/LoginController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/LoginController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/MetricsController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/PieChartController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/PieChartController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/PieChartController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/PieChartController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/SessionController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/SessionController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/SessionController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/SessionController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/TileController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/TileController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/TileController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/TileController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/VelocityResolver.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/VelocityResolver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/VelocityResolver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/VelocityResolver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/WidgetController.java b/core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/WidgetController.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/hicc/rest/WidgetController.java
rename to core/src/main/java/org/apache/hadoop/chukwa/hicc/rest/WidgetController.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/ChukwaInputFormat.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/ChukwaInputFormat.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/ChukwaInputFormat.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/ChukwaInputFormat.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/Employee.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/Employee.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/Employee.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/Employee.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetricsList.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetricsList.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetricsList.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsageMetricsList.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/OrgChart.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/OrgChart.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/OrgChart.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/OrgChart.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetrics.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetrics.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetrics.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetrics.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetricsList.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetricsList.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetricsList.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/ChukwaMetricsList.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/GenericChukwaMetricsList.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/GenericChukwaMetricsList.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/GenericChukwaMetricsList.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/GenericChukwaMetricsList.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginAgent.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginAgent.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginAgent.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginAgent.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginStatusMetricsList.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginStatusMetricsList.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginStatusMetricsList.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/jplugin/JPluginStatusMetricsList.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaTaskLogAppender.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaTaskLogAppender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaTaskLogAppender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaTaskLogAppender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/OneLineLogLayout.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/OneLineLogLayout.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/OneLineLogLayout.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/OneLineLogLayout.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/ErStreamHandler.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/ErStreamHandler.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/ErStreamHandler.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/ErStreamHandler.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/LoaderServer.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/LoaderServer.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/LoaderServer.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/mdl/LoaderServer.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/ExecPlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/IPlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/Exec.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/metrics/ExecHelper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/nodeactivity/NodeActivityPlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java b/core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java
rename to core/src/main/java/org/apache/hadoop/chukwa/inputtools/plugin/pbsnode/PbsNodePlugin.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/CatalogBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/CategoryBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ClientTraceBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ClientTraceBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ClientTraceBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ClientTraceBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ColumnBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ConfigBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ConfigBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ConfigBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ConfigBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/OptionBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/OptionBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/OptionBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/OptionBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/PagesBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ParametersBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ReturnCodeBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/UserBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/UserBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/UserBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/UserBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/ViewBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/bean/WidgetBean.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ClientTrace.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/UserResource.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewContextResolver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/ViewResource.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java b/core/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java
rename to core/src/main/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java b/core/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java
rename to core/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/BackfillingLoader.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/QueueToWriterConnector.java b/core/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/QueueToWriterConnector.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/tools/backfilling/QueueToWriterConnector.java
rename to core/src/main/java/org/apache/hadoop/chukwa/tools/backfilling/QueueToWriterConnector.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/AdaptorNamingUtils.java b/core/src/main/java/org/apache/hadoop/chukwa/util/AdaptorNamingUtils.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/AdaptorNamingUtils.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/AdaptorNamingUtils.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ChukwaUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ClassUtils.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ClusterConfig.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ConstRateAdaptor.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ConstRateValidator.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ConstRateValidator.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ConstRateValidator.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ConstRateValidator.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java b/core/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/CopySequenceFile.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/CreateRecordFile.java b/core/src/main/java/org/apache/hadoop/chukwa/util/CreateRecordFile.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/CreateRecordFile.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/CreateRecordFile.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java b/core/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/DatabaseWriter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/DriverManagerUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/DriverManagerUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/DriverManagerUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/DriverManagerUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/DumpArchive.java b/core/src/main/java/org/apache/hadoop/chukwa/util/DumpArchive.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/DumpArchive.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/DumpArchive.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java b/core/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/DumpChunks.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/DumpRecord.java b/core/src/main/java/org/apache/hadoop/chukwa/util/DumpRecord.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/DumpRecord.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/DumpRecord.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/ExceptionUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/ExceptionUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/ExceptionUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/ExceptionUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/Filter.java b/core/src/main/java/org/apache/hadoop/chukwa/util/Filter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/Filter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/Filter.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/HBaseUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/HBaseUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/HBaseUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/HBaseUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/HierarchyDataType.java b/core/src/main/java/org/apache/hadoop/chukwa/util/HierarchyDataType.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/HierarchyDataType.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/HierarchyDataType.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java b/core/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/MaxRateSender.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/NagiosHelper.java b/core/src/main/java/org/apache/hadoop/chukwa/util/NagiosHelper.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/NagiosHelper.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/NagiosHelper.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/RecordConstants.java b/core/src/main/java/org/apache/hadoop/chukwa/util/RecordConstants.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/RecordConstants.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/RecordConstants.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/RegexUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/RegexUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/RegexUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/RegexUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/RestUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/RestUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/RestUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/RestUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/TempFileUtil.java b/core/src/main/java/org/apache/hadoop/chukwa/util/TempFileUtil.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/TempFileUtil.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/TempFileUtil.java
diff --git a/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java b/core/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java
rename to core/src/main/java/org/apache/hadoop/chukwa/util/XssFilter.java
diff --git a/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java b/core/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
rename to core/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
diff --git a/src/main/resources/ESAPI.properties b/core/src/main/resources/ESAPI.properties
similarity index 100%
rename from src/main/resources/ESAPI.properties
rename to core/src/main/resources/ESAPI.properties
diff --git a/src/main/resources/agent-rest.xml b/core/src/main/resources/agent-rest.xml
similarity index 100%
rename from src/main/resources/agent-rest.xml
rename to core/src/main/resources/agent-rest.xml
diff --git a/src/main/resources/application-grammars.xml b/core/src/main/resources/application-grammars.xml
similarity index 100%
rename from src/main/resources/application-grammars.xml
rename to core/src/main/resources/application-grammars.xml
diff --git a/src/main/resources/chukwachunk.json b/core/src/main/resources/chukwachunk.json
similarity index 100%
rename from src/main/resources/chukwachunk.json
rename to core/src/main/resources/chukwachunk.json
diff --git a/src/main/resources/gora-accumulo-mapping.xml b/core/src/main/resources/gora-accumulo-mapping.xml
similarity index 100%
rename from src/main/resources/gora-accumulo-mapping.xml
rename to core/src/main/resources/gora-accumulo-mapping.xml
diff --git a/src/main/resources/gora-cassandra-mapping.xml b/core/src/main/resources/gora-cassandra-mapping.xml
similarity index 100%
rename from src/main/resources/gora-cassandra-mapping.xml
rename to core/src/main/resources/gora-cassandra-mapping.xml
diff --git a/src/main/resources/gora-hbase-mapping.xml b/core/src/main/resources/gora-hbase-mapping.xml
similarity index 100%
rename from src/main/resources/gora-hbase-mapping.xml
rename to core/src/main/resources/gora-hbase-mapping.xml
diff --git a/src/main/resources/gora-mongodb-mapping.xml b/core/src/main/resources/gora-mongodb-mapping.xml
similarity index 100%
rename from src/main/resources/gora-mongodb-mapping.xml
rename to core/src/main/resources/gora-mongodb-mapping.xml
diff --git a/src/main/resources/gora-solr-mapping.xml b/core/src/main/resources/gora-solr-mapping.xml
similarity index 100%
rename from src/main/resources/gora-solr-mapping.xml
rename to core/src/main/resources/gora-solr-mapping.xml
diff --git a/src/main/resources/gora.properties b/core/src/main/resources/gora.properties
similarity index 100%
rename from src/main/resources/gora.properties
rename to core/src/main/resources/gora.properties
diff --git a/src/main/resources/hicc-rest.xml b/core/src/main/resources/hicc-rest.xml
similarity index 100%
rename from src/main/resources/hicc-rest.xml
rename to core/src/main/resources/hicc-rest.xml
diff --git a/src/main/web/collector/WEB-INF/web.xml b/core/src/main/web/collector/WEB-INF/web.xml
similarity index 100%
rename from src/main/web/collector/WEB-INF/web.xml
rename to core/src/main/web/collector/WEB-INF/web.xml
diff --git a/src/main/web/hicc/WEB-INF/jetty.xml b/core/src/main/web/hicc/WEB-INF/jetty.xml
similarity index 100%
rename from src/main/web/hicc/WEB-INF/jetty.xml
rename to core/src/main/web/hicc/WEB-INF/jetty.xml
diff --git a/src/main/web/hicc/WEB-INF/vm/chart.vm b/core/src/main/web/hicc/WEB-INF/vm/chart.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/chart.vm
rename to core/src/main/web/hicc/WEB-INF/vm/chart.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/circles.vm b/core/src/main/web/hicc/WEB-INF/vm/circles.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/circles.vm
rename to core/src/main/web/hicc/WEB-INF/vm/circles.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/heatmap.vm b/core/src/main/web/hicc/WEB-INF/vm/heatmap.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/heatmap.vm
rename to core/src/main/web/hicc/WEB-INF/vm/heatmap.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/login.vm b/core/src/main/web/hicc/WEB-INF/vm/login.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/login.vm
rename to core/src/main/web/hicc/WEB-INF/vm/login.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/pie.vm b/core/src/main/web/hicc/WEB-INF/vm/pie.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/pie.vm
rename to core/src/main/web/hicc/WEB-INF/vm/pie.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/quick-links.vm b/core/src/main/web/hicc/WEB-INF/vm/quick-links.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/quick-links.vm
rename to core/src/main/web/hicc/WEB-INF/vm/quick-links.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/tile.vm b/core/src/main/web/hicc/WEB-INF/vm/tile.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/tile.vm
rename to core/src/main/web/hicc/WEB-INF/vm/tile.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/unit-bytes-binary.vm b/core/src/main/web/hicc/WEB-INF/vm/unit-bytes-binary.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/unit-bytes-binary.vm
rename to core/src/main/web/hicc/WEB-INF/vm/unit-bytes-binary.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/unit-bytes-decimal.vm b/core/src/main/web/hicc/WEB-INF/vm/unit-bytes-decimal.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/unit-bytes-decimal.vm
rename to core/src/main/web/hicc/WEB-INF/vm/unit-bytes-decimal.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/unit-generic.vm b/core/src/main/web/hicc/WEB-INF/vm/unit-generic.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/unit-generic.vm
rename to core/src/main/web/hicc/WEB-INF/vm/unit-generic.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/unit-ops.vm b/core/src/main/web/hicc/WEB-INF/vm/unit-ops.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/unit-ops.vm
rename to core/src/main/web/hicc/WEB-INF/vm/unit-ops.vm
diff --git a/src/main/web/hicc/WEB-INF/vm/unit-percent.vm b/core/src/main/web/hicc/WEB-INF/vm/unit-percent.vm
similarity index 100%
rename from src/main/web/hicc/WEB-INF/vm/unit-percent.vm
rename to core/src/main/web/hicc/WEB-INF/vm/unit-percent.vm
diff --git a/src/main/web/hicc/WEB-INF/web.xml b/core/src/main/web/hicc/WEB-INF/web.xml
similarity index 100%
rename from src/main/web/hicc/WEB-INF/web.xml
rename to core/src/main/web/hicc/WEB-INF/web.xml
diff --git a/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css b/core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css
rename to core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css
diff --git a/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css b/core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css
rename to core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css
diff --git a/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css b/core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css
rename to core/src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css
diff --git a/src/main/web/hicc/ajax-solr/chukwa/css/logsearch.css b/core/src/main/web/hicc/ajax-solr/chukwa/css/logsearch.css
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/css/logsearch.css
rename to core/src/main/web/hicc/ajax-solr/chukwa/css/logsearch.css
diff --git a/src/main/web/hicc/ajax-solr/chukwa/css/logviewer.css b/core/src/main/web/hicc/ajax-solr/chukwa/css/logviewer.css
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/css/logviewer.css
rename to core/src/main/web/hicc/ajax-solr/chukwa/css/logviewer.css
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ajax-loader.gif b/core/src/main/web/hicc/ajax-solr/chukwa/images/ajax-loader.gif
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ajax-loader.gif
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ajax-loader.gif
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/header.gif b/core/src/main/web/hicc/ajax-solr/chukwa/images/header.gif
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/header.gif
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/header.gif
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_0_aaaaaa_40x100.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_0_aaaaaa_40x100.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_5A707F_40x100.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_5A707F_40x100.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_5A707F_40x100.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_5A707F_40x100.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_ffffff_40x100.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_ffffff_40x100.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_flat_75_ffffff_40x100.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_40_95B1C5_1x400.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_40_95B1C5_1x400.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_40_95B1C5_1x400.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_40_95B1C5_1x400.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_55_5A707F_1x400.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_55_5A707F_1x400.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_55_5A707F_1x400.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_55_5A707F_1x400.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_65_ffffff_1x400.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_65_ffffff_1x400.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_65_ffffff_1x400.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_95_fef1ec_1x400.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_95_fef1ec_1x400.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_glass_95_fef1ec_1x400.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-bg_highlight-soft_75_e6e6e6_1x100.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_222222_256x240.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_222222_256x240.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_222222_256x240.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_222222_256x240.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_454545_256x240.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_454545_256x240.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_454545_256x240.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_454545_256x240.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_888888_256x240.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_888888_256x240.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_888888_256x240.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_888888_256x240.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_cd0a0a_256x240.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_cd0a0a_256x240.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_cd0a0a_256x240.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_ffffff_256x240.png b/core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_ffffff_256x240.png
rename to core/src/main/web/hicc/ajax-solr/chukwa/images/ui-icons_ffffff_256x240.png
Binary files differ
diff --git a/src/main/web/hicc/ajax-solr/chukwa/index.html b/core/src/main/web/hicc/ajax-solr/chukwa/index.html
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/index.html
rename to core/src/main/web/hicc/ajax-solr/chukwa/index.html
diff --git a/src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js b/core/src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js b/core/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/js/logviewer.js b/core/src/main/web/hicc/ajax-solr/chukwa/js/logviewer.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/js/logviewer.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/js/logviewer.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/js/require.min.js b/core/src/main/web/hicc/ajax-solr/chukwa/js/require.min.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/js/require.min.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/js/require.min.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/log-viewer.html b/core/src/main/web/hicc/ajax-solr/chukwa/log-viewer.html
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/log-viewer.html
rename to core/src/main/web/hicc/ajax-solr/chukwa/log-viewer.html
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.7.0.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.7.0.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.7.0.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.7.0.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/AutocompleteWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/CalendarWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/CalendarWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/CalendarWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/CalendarWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.8.0.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.8.0.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.8.0.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.8.0.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/CountryCodeWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.9.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.9.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.9.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.9.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/CurrentSearchWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.2.0.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.2.0.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.2.0.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.2.0.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.f.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.f.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.f.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.f.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/ResultWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/TagcloudWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/TagcloudWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/TagcloudWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/TagcloudWidget.js
diff --git a/src/main/web/hicc/ajax-solr/chukwa/widgets/TextWidget.js b/core/src/main/web/hicc/ajax-solr/chukwa/widgets/TextWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/chukwa/widgets/TextWidget.js
rename to core/src/main/web/hicc/ajax-solr/chukwa/widgets/TextWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractFacetWidget.js b/core/src/main/web/hicc/ajax-solr/core/AbstractFacetWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractFacetWidget.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractFacetWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractManager.js b/core/src/main/web/hicc/ajax-solr/core/AbstractManager.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractManager.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractManager.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractSpatialWidget.js b/core/src/main/web/hicc/ajax-solr/core/AbstractSpatialWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractSpatialWidget.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractSpatialWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractSpellcheckWidget.js b/core/src/main/web/hicc/ajax-solr/core/AbstractSpellcheckWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractSpellcheckWidget.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractSpellcheckWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractTextWidget.js b/core/src/main/web/hicc/ajax-solr/core/AbstractTextWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractTextWidget.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractTextWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/AbstractWidget.js b/core/src/main/web/hicc/ajax-solr/core/AbstractWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/AbstractWidget.js
rename to core/src/main/web/hicc/ajax-solr/core/AbstractWidget.js
diff --git a/src/main/web/hicc/ajax-solr/core/Core.js b/core/src/main/web/hicc/ajax-solr/core/Core.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/Core.js
rename to core/src/main/web/hicc/ajax-solr/core/Core.js
diff --git a/src/main/web/hicc/ajax-solr/core/Parameter.js b/core/src/main/web/hicc/ajax-solr/core/Parameter.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/Parameter.js
rename to core/src/main/web/hicc/ajax-solr/core/Parameter.js
diff --git a/src/main/web/hicc/ajax-solr/core/ParameterHashStore.js b/core/src/main/web/hicc/ajax-solr/core/ParameterHashStore.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/ParameterHashStore.js
rename to core/src/main/web/hicc/ajax-solr/core/ParameterHashStore.js
diff --git a/src/main/web/hicc/ajax-solr/core/ParameterStore.js b/core/src/main/web/hicc/ajax-solr/core/ParameterStore.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/core/ParameterStore.js
rename to core/src/main/web/hicc/ajax-solr/core/ParameterStore.js
diff --git a/src/main/web/hicc/ajax-solr/managers/Manager.jquery.js b/core/src/main/web/hicc/ajax-solr/managers/Manager.jquery.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/managers/Manager.jquery.js
rename to core/src/main/web/hicc/ajax-solr/managers/Manager.jquery.js
diff --git a/src/main/web/hicc/ajax-solr/widgets/ParameterHistoryStore.js b/core/src/main/web/hicc/ajax-solr/widgets/ParameterHistoryStore.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/widgets/ParameterHistoryStore.js
rename to core/src/main/web/hicc/ajax-solr/widgets/ParameterHistoryStore.js
diff --git a/src/main/web/hicc/ajax-solr/widgets/ParameterYUIStore.js b/core/src/main/web/hicc/ajax-solr/widgets/ParameterYUIStore.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/widgets/ParameterYUIStore.js
rename to core/src/main/web/hicc/ajax-solr/widgets/ParameterYUIStore.js
diff --git a/src/main/web/hicc/ajax-solr/widgets/jquery/AutocompleteTermWidget.js b/core/src/main/web/hicc/ajax-solr/widgets/jquery/AutocompleteTermWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/widgets/jquery/AutocompleteTermWidget.js
rename to core/src/main/web/hicc/ajax-solr/widgets/jquery/AutocompleteTermWidget.js
diff --git a/src/main/web/hicc/ajax-solr/widgets/jquery/PagerWidget.js b/core/src/main/web/hicc/ajax-solr/widgets/jquery/PagerWidget.js
similarity index 100%
rename from src/main/web/hicc/ajax-solr/widgets/jquery/PagerWidget.js
rename to core/src/main/web/hicc/ajax-solr/widgets/jquery/PagerWidget.js
diff --git a/src/main/web/hicc/alerts/index.html b/core/src/main/web/hicc/alerts/index.html
similarity index 100%
rename from src/main/web/hicc/alerts/index.html
rename to core/src/main/web/hicc/alerts/index.html
diff --git a/src/main/web/hicc/apps/apps-usage.html b/core/src/main/web/hicc/apps/apps-usage.html
similarity index 100%
rename from src/main/web/hicc/apps/apps-usage.html
rename to core/src/main/web/hicc/apps/apps-usage.html
diff --git a/src/main/web/hicc/apps/index.html b/core/src/main/web/hicc/apps/index.html
similarity index 100%
rename from src/main/web/hicc/apps/index.html
rename to core/src/main/web/hicc/apps/index.html
diff --git a/src/main/web/hicc/apps/pie.js b/core/src/main/web/hicc/apps/pie.js
similarity index 100%
rename from src/main/web/hicc/apps/pie.js
rename to core/src/main/web/hicc/apps/pie.js
diff --git a/src/main/web/hicc/clusters/index.html b/core/src/main/web/hicc/clusters/index.html
similarity index 100%
rename from src/main/web/hicc/clusters/index.html
rename to core/src/main/web/hicc/clusters/index.html
diff --git a/src/main/web/hicc/css/bootstrap-theme.css.map b/core/src/main/web/hicc/css/bootstrap-theme.css.map
similarity index 100%
rename from src/main/web/hicc/css/bootstrap-theme.css.map
rename to core/src/main/web/hicc/css/bootstrap-theme.css.map
diff --git a/src/main/web/hicc/css/bootstrap-theme.min.css b/core/src/main/web/hicc/css/bootstrap-theme.min.css
similarity index 100%
rename from src/main/web/hicc/css/bootstrap-theme.min.css
rename to core/src/main/web/hicc/css/bootstrap-theme.min.css
diff --git a/src/main/web/hicc/css/bootstrap.min.css b/core/src/main/web/hicc/css/bootstrap.min.css
similarity index 100%
rename from src/main/web/hicc/css/bootstrap.min.css
rename to core/src/main/web/hicc/css/bootstrap.min.css
diff --git a/src/main/web/hicc/css/chartist.css b/core/src/main/web/hicc/css/chartist.css
similarity index 100%
rename from src/main/web/hicc/css/chartist.css
rename to core/src/main/web/hicc/css/chartist.css
diff --git a/src/main/web/hicc/css/chartist.css.map b/core/src/main/web/hicc/css/chartist.css.map
similarity index 100%
rename from src/main/web/hicc/css/chartist.css.map
rename to core/src/main/web/hicc/css/chartist.css.map
diff --git a/src/main/web/hicc/css/default.css b/core/src/main/web/hicc/css/default.css
similarity index 100%
rename from src/main/web/hicc/css/default.css
rename to core/src/main/web/hicc/css/default.css
diff --git a/src/main/web/hicc/css/flexigrid/flexigrid.css b/core/src/main/web/hicc/css/flexigrid/flexigrid.css
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/flexigrid.css
rename to core/src/main/web/hicc/css/flexigrid/flexigrid.css
diff --git a/src/main/web/hicc/css/flexigrid/images/bg.gif b/core/src/main/web/hicc/css/flexigrid/images/bg.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/bg.gif
rename to core/src/main/web/hicc/css/flexigrid/images/bg.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/btn-sprite.gif b/core/src/main/web/hicc/css/flexigrid/images/btn-sprite.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/btn-sprite.gif
rename to core/src/main/web/hicc/css/flexigrid/images/btn-sprite.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/ddn.png b/core/src/main/web/hicc/css/flexigrid/images/ddn.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/ddn.png
rename to core/src/main/web/hicc/css/flexigrid/images/ddn.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/dn.png b/core/src/main/web/hicc/css/flexigrid/images/dn.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/dn.png
rename to core/src/main/web/hicc/css/flexigrid/images/dn.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/fhbg.gif b/core/src/main/web/hicc/css/flexigrid/images/fhbg.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/fhbg.gif
rename to core/src/main/web/hicc/css/flexigrid/images/fhbg.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/first.gif b/core/src/main/web/hicc/css/flexigrid/images/first.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/first.gif
rename to core/src/main/web/hicc/css/flexigrid/images/first.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/hl.png b/core/src/main/web/hicc/css/flexigrid/images/hl.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/hl.png
rename to core/src/main/web/hicc/css/flexigrid/images/hl.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/last.gif b/core/src/main/web/hicc/css/flexigrid/images/last.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/last.gif
rename to core/src/main/web/hicc/css/flexigrid/images/last.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/line.gif b/core/src/main/web/hicc/css/flexigrid/images/line.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/line.gif
rename to core/src/main/web/hicc/css/flexigrid/images/line.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/load.gif b/core/src/main/web/hicc/css/flexigrid/images/load.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/load.gif
rename to core/src/main/web/hicc/css/flexigrid/images/load.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/load.png b/core/src/main/web/hicc/css/flexigrid/images/load.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/load.png
rename to core/src/main/web/hicc/css/flexigrid/images/load.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/magnifier.png b/core/src/main/web/hicc/css/flexigrid/images/magnifier.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/magnifier.png
rename to core/src/main/web/hicc/css/flexigrid/images/magnifier.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/next.gif b/core/src/main/web/hicc/css/flexigrid/images/next.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/next.gif
rename to core/src/main/web/hicc/css/flexigrid/images/next.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/prev.gif b/core/src/main/web/hicc/css/flexigrid/images/prev.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/prev.gif
rename to core/src/main/web/hicc/css/flexigrid/images/prev.gif
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/up.png b/core/src/main/web/hicc/css/flexigrid/images/up.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/up.png
rename to core/src/main/web/hicc/css/flexigrid/images/up.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/uup.png b/core/src/main/web/hicc/css/flexigrid/images/uup.png
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/uup.png
rename to core/src/main/web/hicc/css/flexigrid/images/uup.png
Binary files differ
diff --git a/src/main/web/hicc/css/flexigrid/images/wbg.gif b/core/src/main/web/hicc/css/flexigrid/images/wbg.gif
similarity index 100%
rename from src/main/web/hicc/css/flexigrid/images/wbg.gif
rename to core/src/main/web/hicc/css/flexigrid/images/wbg.gif
Binary files differ
diff --git a/src/main/web/hicc/css/font-awesome.min.css b/core/src/main/web/hicc/css/font-awesome.min.css
similarity index 100%
rename from src/main/web/hicc/css/font-awesome.min.css
rename to core/src/main/web/hicc/css/font-awesome.min.css
diff --git a/src/main/web/hicc/css/formalize.css b/core/src/main/web/hicc/css/formalize.css
similarity index 100%
rename from src/main/web/hicc/css/formalize.css
rename to core/src/main/web/hicc/css/formalize.css
diff --git a/src/main/web/hicc/css/iframe.css b/core/src/main/web/hicc/css/iframe.css
similarity index 100%
rename from src/main/web/hicc/css/iframe.css
rename to core/src/main/web/hicc/css/iframe.css
diff --git a/src/main/web/hicc/css/images/bg.jpg b/core/src/main/web/hicc/css/images/bg.jpg
similarity index 100%
rename from src/main/web/hicc/css/images/bg.jpg
rename to core/src/main/web/hicc/css/images/bg.jpg
Binary files differ
diff --git a/src/main/web/hicc/css/images/close.png b/core/src/main/web/hicc/css/images/close.png
similarity index 100%
rename from src/main/web/hicc/css/images/close.png
rename to core/src/main/web/hicc/css/images/close.png
Binary files differ
diff --git a/src/main/web/hicc/css/images/handle.png b/core/src/main/web/hicc/css/images/handle.png
similarity index 100%
rename from src/main/web/hicc/css/images/handle.png
rename to core/src/main/web/hicc/css/images/handle.png
Binary files differ
diff --git a/src/main/web/hicc/css/images/info.png b/core/src/main/web/hicc/css/images/info.png
similarity index 100%
rename from src/main/web/hicc/css/images/info.png
rename to core/src/main/web/hicc/css/images/info.png
Binary files differ
diff --git a/src/main/web/hicc/css/images/navbar-selected.gif b/core/src/main/web/hicc/css/images/navbar-selected.gif
similarity index 100%
rename from src/main/web/hicc/css/images/navbar-selected.gif
rename to core/src/main/web/hicc/css/images/navbar-selected.gif
Binary files differ
diff --git a/src/main/web/hicc/css/images/refresh.png b/core/src/main/web/hicc/css/images/refresh.png
similarity index 100%
rename from src/main/web/hicc/css/images/refresh.png
rename to core/src/main/web/hicc/css/images/refresh.png
Binary files differ
diff --git a/src/main/web/hicc/css/images/stop.png b/core/src/main/web/hicc/css/images/stop.png
similarity index 100%
rename from src/main/web/hicc/css/images/stop.png
rename to core/src/main/web/hicc/css/images/stop.png
Binary files differ
diff --git a/src/main/web/hicc/css/images/titlebar.gif b/core/src/main/web/hicc/css/images/titlebar.gif
similarity index 100%
rename from src/main/web/hicc/css/images/titlebar.gif
rename to core/src/main/web/hicc/css/images/titlebar.gif
Binary files differ
diff --git a/src/main/web/hicc/css/images/titlebar.png b/core/src/main/web/hicc/css/images/titlebar.png
similarity index 100%
rename from src/main/web/hicc/css/images/titlebar.png
rename to core/src/main/web/hicc/css/images/titlebar.png
Binary files differ
diff --git a/src/main/web/hicc/css/iui.css b/core/src/main/web/hicc/css/iui.css
similarity index 100%
rename from src/main/web/hicc/css/iui.css
rename to core/src/main/web/hicc/css/iui.css
diff --git a/src/main/web/hicc/css/jquery.circliful.css b/core/src/main/web/hicc/css/jquery.circliful.css
similarity index 100%
rename from src/main/web/hicc/css/jquery.circliful.css
rename to core/src/main/web/hicc/css/jquery.circliful.css
diff --git a/src/main/web/hicc/css/login.css b/core/src/main/web/hicc/css/login.css
similarity index 100%
rename from src/main/web/hicc/css/login.css
rename to core/src/main/web/hicc/css/login.css
diff --git a/src/main/web/hicc/css/menu.css b/core/src/main/web/hicc/css/menu.css
similarity index 100%
rename from src/main/web/hicc/css/menu.css
rename to core/src/main/web/hicc/css/menu.css
diff --git a/src/main/web/hicc/css/tab.css b/core/src/main/web/hicc/css/tab.css
similarity index 100%
rename from src/main/web/hicc/css/tab.css
rename to core/src/main/web/hicc/css/tab.css
diff --git a/src/main/web/hicc/css/timeframe.css b/core/src/main/web/hicc/css/timeframe.css
similarity index 100%
rename from src/main/web/hicc/css/timeframe.css
rename to core/src/main/web/hicc/css/timeframe.css
diff --git a/src/main/web/hicc/css/timeline.css b/core/src/main/web/hicc/css/timeline.css
similarity index 100%
rename from src/main/web/hicc/css/timeline.css
rename to core/src/main/web/hicc/css/timeline.css
diff --git a/src/main/web/hicc/css/welcome.css b/core/src/main/web/hicc/css/welcome.css
similarity index 100%
rename from src/main/web/hicc/css/welcome.css
rename to core/src/main/web/hicc/css/welcome.css
diff --git a/src/main/web/hicc/descriptors/cluster_metrics.descriptor b/core/src/main/web/hicc/descriptors/cluster_metrics.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/cluster_metrics.descriptor
rename to core/src/main/web/hicc/descriptors/cluster_metrics.descriptor
diff --git a/src/main/web/hicc/descriptors/cluster_selector.descriptor b/core/src/main/web/hicc/descriptors/cluster_selector.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/cluster_selector.descriptor
rename to core/src/main/web/hicc/descriptors/cluster_selector.descriptor
diff --git a/src/main/web/hicc/descriptors/debug.descriptor b/core/src/main/web/hicc/descriptors/debug.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/debug.descriptor
rename to core/src/main/web/hicc/descriptors/debug.descriptor
diff --git a/src/main/web/hicc/descriptors/dfs_datanode.descriptor b/core/src/main/web/hicc/descriptors/dfs_datanode.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/dfs_datanode.descriptor
rename to core/src/main/web/hicc/descriptors/dfs_datanode.descriptor
diff --git a/src/main/web/hicc/descriptors/dfs_fsnamesystem.descriptor b/core/src/main/web/hicc/descriptors/dfs_fsnamesystem.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/dfs_fsnamesystem.descriptor
rename to core/src/main/web/hicc/descriptors/dfs_fsnamesystem.descriptor
diff --git a/src/main/web/hicc/descriptors/dfs_namenode.descriptor b/core/src/main/web/hicc/descriptors/dfs_namenode.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/dfs_namenode.descriptor
rename to core/src/main/web/hicc/descriptors/dfs_namenode.descriptor
diff --git a/src/main/web/hicc/descriptors/disabled/client_trace.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/client_trace.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/client_trace.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/client_trace.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/dfs_throughput.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/dfs_throughput.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/dfs_throughput.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/dfs_throughput.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/hadoop_activity.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/hadoop_activity.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/hadoop_activity.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/hadoop_activity.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/heatmap-static.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/heatmap-static.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/heatmap-static.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/heatmap-static.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/heatmap_datanode.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/heatmap_datanode.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/heatmap_datanode.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/heatmap_datanode.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/jvm_metrics.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/jvm_metrics.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/jvm_metrics.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/jvm_metrics.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/node_activity_chart.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/node_activity_chart.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/node_activity_chart.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/node_activity_chart.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/rpc_metrics.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/rpc_metrics.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/rpc_metrics.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/rpc_metrics.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/swimlanes-static.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/swimlanes-static.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/swimlanes-static.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/swimlanes-static.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/disabled/swimlanes.descriptor.disabled b/core/src/main/web/hicc/descriptors/disabled/swimlanes.descriptor.disabled
similarity index 100%
rename from src/main/web/hicc/descriptors/disabled/swimlanes.descriptor.disabled
rename to core/src/main/web/hicc/descriptors/disabled/swimlanes.descriptor.disabled
diff --git a/src/main/web/hicc/descriptors/event_viewer.descriptor b/core/src/main/web/hicc/descriptors/event_viewer.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/event_viewer.descriptor
rename to core/src/main/web/hicc/descriptors/event_viewer.descriptor
diff --git a/src/main/web/hicc/descriptors/graph_explorer.descriptor b/core/src/main/web/hicc/descriptors/graph_explorer.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/graph_explorer.descriptor
rename to core/src/main/web/hicc/descriptors/graph_explorer.descriptor
diff --git a/src/main/web/hicc/descriptors/hadoop_mapred.descriptor b/core/src/main/web/hicc/descriptors/hadoop_mapred.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/hadoop_mapred.descriptor
rename to core/src/main/web/hicc/descriptors/hadoop_mapred.descriptor
diff --git a/src/main/web/hicc/descriptors/host_selector.descriptor b/core/src/main/web/hicc/descriptors/host_selector.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/host_selector.descriptor
rename to core/src/main/web/hicc/descriptors/host_selector.descriptor
diff --git a/src/main/web/hicc/descriptors/system_heatmap.descriptor b/core/src/main/web/hicc/descriptors/system_heatmap.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/system_heatmap.descriptor
rename to core/src/main/web/hicc/descriptors/system_heatmap.descriptor
diff --git a/src/main/web/hicc/descriptors/system_metrics.descriptor b/core/src/main/web/hicc/descriptors/system_metrics.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/system_metrics.descriptor
rename to core/src/main/web/hicc/descriptors/system_metrics.descriptor
diff --git a/src/main/web/hicc/descriptors/time.descriptor b/core/src/main/web/hicc/descriptors/time.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/time.descriptor
rename to core/src/main/web/hicc/descriptors/time.descriptor
diff --git a/src/main/web/hicc/descriptors/utilization.descriptor b/core/src/main/web/hicc/descriptors/utilization.descriptor
similarity index 100%
rename from src/main/web/hicc/descriptors/utilization.descriptor
rename to core/src/main/web/hicc/descriptors/utilization.descriptor
diff --git a/src/main/web/hicc/fonts/glyphicons-halflings-regular.eot b/core/src/main/web/hicc/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/main/web/hicc/fonts/glyphicons-halflings-regular.eot
rename to core/src/main/web/hicc/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/src/main/web/hicc/fonts/glyphicons-halflings-regular.svg b/core/src/main/web/hicc/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/main/web/hicc/fonts/glyphicons-halflings-regular.svg
rename to core/src/main/web/hicc/fonts/glyphicons-halflings-regular.svg
diff --git a/src/main/web/hicc/fonts/glyphicons-halflings-regular.ttf b/core/src/main/web/hicc/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/main/web/hicc/fonts/glyphicons-halflings-regular.ttf
rename to core/src/main/web/hicc/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff b/core/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/main/web/hicc/fonts/glyphicons-halflings-regular.woff
rename to core/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff2 b/core/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/main/web/hicc/fonts/glyphicons-halflings-regular.woff2
rename to core/src/main/web/hicc/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/src/main/web/hicc/home/apps.html b/core/src/main/web/hicc/home/apps.html
similarity index 100%
rename from src/main/web/hicc/home/apps.html
rename to core/src/main/web/hicc/home/apps.html
diff --git a/src/main/web/hicc/home/clusters.html b/core/src/main/web/hicc/home/clusters.html
similarity index 100%
rename from src/main/web/hicc/home/clusters.html
rename to core/src/main/web/hicc/home/clusters.html
diff --git a/src/main/web/hicc/home/css/bootstrap-iconpicker.min.css b/core/src/main/web/hicc/home/css/bootstrap-iconpicker.min.css
similarity index 100%
rename from src/main/web/hicc/home/css/bootstrap-iconpicker.min.css
rename to core/src/main/web/hicc/home/css/bootstrap-iconpicker.min.css
diff --git a/src/main/web/hicc/home/css/component.css b/core/src/main/web/hicc/home/css/component.css
similarity index 100%
rename from src/main/web/hicc/home/css/component.css
rename to core/src/main/web/hicc/home/css/component.css
diff --git a/src/main/web/hicc/home/css/gridstack.min.css b/core/src/main/web/hicc/home/css/gridstack.min.css
similarity index 100%
rename from src/main/web/hicc/home/css/gridstack.min.css
rename to core/src/main/web/hicc/home/css/gridstack.min.css
diff --git a/src/main/web/hicc/home/css/jquery.gridster.css b/core/src/main/web/hicc/home/css/jquery.gridster.css
similarity index 100%
rename from src/main/web/hicc/home/css/jquery.gridster.css
rename to core/src/main/web/hicc/home/css/jquery.gridster.css
diff --git a/src/main/web/hicc/home/css/normalize.css b/core/src/main/web/hicc/home/css/normalize.css
similarity index 100%
rename from src/main/web/hicc/home/css/normalize.css
rename to core/src/main/web/hicc/home/css/normalize.css
diff --git a/src/main/web/hicc/home/css/select2.min.css b/core/src/main/web/hicc/home/css/select2.min.css
similarity index 100%
rename from src/main/web/hicc/home/css/select2.min.css
rename to core/src/main/web/hicc/home/css/select2.min.css
diff --git a/src/main/web/hicc/home/downloads.html b/core/src/main/web/hicc/home/downloads.html
similarity index 100%
rename from src/main/web/hicc/home/downloads.html
rename to core/src/main/web/hicc/home/downloads.html
diff --git a/src/main/web/hicc/home/fonts/codropsicons/codropsicons.eot b/core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.eot
similarity index 100%
rename from src/main/web/hicc/home/fonts/codropsicons/codropsicons.eot
rename to core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.eot
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/codropsicons/codropsicons.svg b/core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.svg
similarity index 100%
rename from src/main/web/hicc/home/fonts/codropsicons/codropsicons.svg
rename to core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.svg
diff --git a/src/main/web/hicc/home/fonts/codropsicons/codropsicons.ttf b/core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.ttf
similarity index 100%
rename from src/main/web/hicc/home/fonts/codropsicons/codropsicons.ttf
rename to core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.ttf
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/codropsicons/codropsicons.woff b/core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.woff
similarity index 100%
rename from src/main/web/hicc/home/fonts/codropsicons/codropsicons.woff
rename to core/src/main/web/hicc/home/fonts/codropsicons/codropsicons.woff
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/codropsicons/license.txt b/core/src/main/web/hicc/home/fonts/codropsicons/license.txt
similarity index 100%
rename from src/main/web/hicc/home/fonts/codropsicons/license.txt
rename to core/src/main/web/hicc/home/fonts/codropsicons/license.txt
diff --git a/src/main/web/hicc/home/fonts/ecoicons/Read Me.txt b/core/src/main/web/hicc/home/fonts/ecoicons/Read Me.txt
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/Read Me.txt
rename to core/src/main/web/hicc/home/fonts/ecoicons/Read Me.txt
diff --git a/src/main/web/hicc/home/fonts/ecoicons/ecoicons.dev.svg b/core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.dev.svg
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/ecoicons.dev.svg
rename to core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.dev.svg
diff --git a/src/main/web/hicc/home/fonts/ecoicons/ecoicons.eot b/core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.eot
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/ecoicons.eot
rename to core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.eot
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/ecoicons/ecoicons.svg b/core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.svg
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/ecoicons.svg
rename to core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.svg
diff --git a/src/main/web/hicc/home/fonts/ecoicons/ecoicons.ttf b/core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.ttf
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/ecoicons.ttf
rename to core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.ttf
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/ecoicons/ecoicons.woff b/core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.woff
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/ecoicons.woff
rename to core/src/main/web/hicc/home/fonts/ecoicons/ecoicons.woff
Binary files differ
diff --git a/src/main/web/hicc/home/fonts/ecoicons/license.txt b/core/src/main/web/hicc/home/fonts/ecoicons/license.txt
similarity index 100%
rename from src/main/web/hicc/home/fonts/ecoicons/license.txt
rename to core/src/main/web/hicc/home/fonts/ecoicons/license.txt
diff --git a/src/main/web/hicc/home/graph-explorer.html b/core/src/main/web/hicc/home/graph-explorer.html
similarity index 100%
rename from src/main/web/hicc/home/graph-explorer.html
rename to core/src/main/web/hicc/home/graph-explorer.html
diff --git a/src/main/web/hicc/home/help/index.html b/core/src/main/web/hicc/home/help/index.html
similarity index 100%
rename from src/main/web/hicc/home/help/index.html
rename to core/src/main/web/hicc/home/help/index.html
diff --git a/src/main/web/hicc/home/index.html b/core/src/main/web/hicc/home/index.html
similarity index 100%
rename from src/main/web/hicc/home/index.html
rename to core/src/main/web/hicc/home/index.html
diff --git a/src/main/web/hicc/home/js/bootstrap-iconpicker.min.js b/core/src/main/web/hicc/home/js/bootstrap-iconpicker.min.js
similarity index 100%
rename from src/main/web/hicc/home/js/bootstrap-iconpicker.min.js
rename to core/src/main/web/hicc/home/js/bootstrap-iconpicker.min.js
diff --git a/src/main/web/hicc/home/js/classie.js b/core/src/main/web/hicc/home/js/classie.js
similarity index 100%
rename from src/main/web/hicc/home/js/classie.js
rename to core/src/main/web/hicc/home/js/classie.js
diff --git a/src/main/web/hicc/home/js/gnmenu.js b/core/src/main/web/hicc/home/js/gnmenu.js
similarity index 100%
rename from src/main/web/hicc/home/js/gnmenu.js
rename to core/src/main/web/hicc/home/js/gnmenu.js
diff --git a/src/main/web/hicc/home/js/gridstack.min.js b/core/src/main/web/hicc/home/js/gridstack.min.js
similarity index 100%
rename from src/main/web/hicc/home/js/gridstack.min.js
rename to core/src/main/web/hicc/home/js/gridstack.min.js
diff --git a/src/main/web/hicc/home/js/gridstack.min.map b/core/src/main/web/hicc/home/js/gridstack.min.map
similarity index 100%
rename from src/main/web/hicc/home/js/gridstack.min.map
rename to core/src/main/web/hicc/home/js/gridstack.min.map
diff --git a/src/main/web/hicc/home/js/iconset/iconset-glyphicon.min.js b/core/src/main/web/hicc/home/js/iconset/iconset-glyphicon.min.js
similarity index 100%
rename from src/main/web/hicc/home/js/iconset/iconset-glyphicon.min.js
rename to core/src/main/web/hicc/home/js/iconset/iconset-glyphicon.min.js
diff --git a/src/main/web/hicc/home/js/jquery-ui.js b/core/src/main/web/hicc/home/js/jquery-ui.js
similarity index 100%
rename from src/main/web/hicc/home/js/jquery-ui.js
rename to core/src/main/web/hicc/home/js/jquery-ui.js
diff --git a/src/main/web/hicc/home/js/jquery.js b/core/src/main/web/hicc/home/js/jquery.js
similarity index 100%
rename from src/main/web/hicc/home/js/jquery.js
rename to core/src/main/web/hicc/home/js/jquery.js
diff --git a/src/main/web/hicc/home/js/lodash.min.js b/core/src/main/web/hicc/home/js/lodash.min.js
similarity index 100%
rename from src/main/web/hicc/home/js/lodash.min.js
rename to core/src/main/web/hicc/home/js/lodash.min.js
diff --git a/src/main/web/hicc/home/js/modernizr.custom.js b/core/src/main/web/hicc/home/js/modernizr.custom.js
similarity index 100%
rename from src/main/web/hicc/home/js/modernizr.custom.js
rename to core/src/main/web/hicc/home/js/modernizr.custom.js
diff --git a/src/main/web/hicc/home/js/select2.min.js b/core/src/main/web/hicc/home/js/select2.min.js
similarity index 100%
rename from src/main/web/hicc/home/js/select2.min.js
rename to core/src/main/web/hicc/home/js/select2.min.js
diff --git a/src/main/web/hicc/home/js/throttle.js b/core/src/main/web/hicc/home/js/throttle.js
similarity index 100%
rename from src/main/web/hicc/home/js/throttle.js
rename to core/src/main/web/hicc/home/js/throttle.js
diff --git a/src/main/web/hicc/home/js/typeahead.bundle.js b/core/src/main/web/hicc/home/js/typeahead.bundle.js
similarity index 100%
rename from src/main/web/hicc/home/js/typeahead.bundle.js
rename to core/src/main/web/hicc/home/js/typeahead.bundle.js
diff --git a/src/main/web/hicc/home/settings/index.html b/core/src/main/web/hicc/home/settings/index.html
similarity index 100%
rename from src/main/web/hicc/home/settings/index.html
rename to core/src/main/web/hicc/home/settings/index.html
diff --git a/src/main/web/hicc/home/tile.html b/core/src/main/web/hicc/home/tile.html
similarity index 100%
rename from src/main/web/hicc/home/tile.html
rename to core/src/main/web/hicc/home/tile.html
diff --git a/src/main/web/hicc/home/users.html b/core/src/main/web/hicc/home/users.html
similarity index 100%
rename from src/main/web/hicc/home/users.html
rename to core/src/main/web/hicc/home/users.html
diff --git a/src/main/web/hicc/images/SliderThumb.png b/core/src/main/web/hicc/images/SliderThumb.png
similarity index 100%
rename from src/main/web/hicc/images/SliderThumb.png
rename to core/src/main/web/hicc/images/SliderThumb.png
Binary files differ
diff --git a/src/main/web/hicc/images/SliderThumb2.png b/core/src/main/web/hicc/images/SliderThumb2.png
similarity index 100%
rename from src/main/web/hicc/images/SliderThumb2.png
rename to core/src/main/web/hicc/images/SliderThumb2.png
Binary files differ
diff --git a/src/main/web/hicc/images/add_widget.png b/core/src/main/web/hicc/images/add_widget.png
similarity index 100%
rename from src/main/web/hicc/images/add_widget.png
rename to core/src/main/web/hicc/images/add_widget.png
Binary files differ
diff --git a/src/main/web/hicc/images/application.png b/core/src/main/web/hicc/images/application.png
similarity index 100%
rename from src/main/web/hicc/images/application.png
rename to core/src/main/web/hicc/images/application.png
Binary files differ
diff --git a/src/main/web/hicc/images/application_edit.png b/core/src/main/web/hicc/images/application_edit.png
similarity index 100%
rename from src/main/web/hicc/images/application_edit.png
rename to core/src/main/web/hicc/images/application_edit.png
Binary files differ
diff --git a/src/main/web/hicc/images/arrow_down.png b/core/src/main/web/hicc/images/arrow_down.png
similarity index 100%
rename from src/main/web/hicc/images/arrow_down.png
rename to core/src/main/web/hicc/images/arrow_down.png
Binary files differ
diff --git a/src/main/web/hicc/images/arrow_left.png b/core/src/main/web/hicc/images/arrow_left.png
similarity index 100%
rename from src/main/web/hicc/images/arrow_left.png
rename to core/src/main/web/hicc/images/arrow_left.png
Binary files differ
diff --git a/src/main/web/hicc/images/arrow_right.png b/core/src/main/web/hicc/images/arrow_right.png
similarity index 100%
rename from src/main/web/hicc/images/arrow_right.png
rename to core/src/main/web/hicc/images/arrow_right.png
Binary files differ
diff --git a/src/main/web/hicc/images/backButton.png b/core/src/main/web/hicc/images/backButton.png
similarity index 100%
rename from src/main/web/hicc/images/backButton.png
rename to core/src/main/web/hicc/images/backButton.png
Binary files differ
diff --git a/src/main/web/hicc/images/blank.gif b/core/src/main/web/hicc/images/blank.gif
similarity index 100%
rename from src/main/web/hicc/images/blank.gif
rename to core/src/main/web/hicc/images/blank.gif
Binary files differ
diff --git a/src/main/web/hicc/images/blueButton.png b/core/src/main/web/hicc/images/blueButton.png
similarity index 100%
rename from src/main/web/hicc/images/blueButton.png
rename to core/src/main/web/hicc/images/blueButton.png
Binary files differ
diff --git a/src/main/web/hicc/images/bullet_arrow_top.png b/core/src/main/web/hicc/images/bullet_arrow_top.png
similarity index 100%
rename from src/main/web/hicc/images/bullet_arrow_top.png
rename to core/src/main/web/hicc/images/bullet_arrow_top.png
Binary files differ
diff --git a/src/main/web/hicc/images/bullet_white.png b/core/src/main/web/hicc/images/bullet_white.png
similarity index 100%
rename from src/main/web/hicc/images/bullet_white.png
rename to core/src/main/web/hicc/images/bullet_white.png
Binary files differ
diff --git a/src/main/web/hicc/images/button.png b/core/src/main/web/hicc/images/button.png
similarity index 100%
rename from src/main/web/hicc/images/button.png
rename to core/src/main/web/hicc/images/button.png
Binary files differ
diff --git a/src/main/web/hicc/images/cancel.png b/core/src/main/web/hicc/images/cancel.png
similarity index 100%
rename from src/main/web/hicc/images/cancel.png
rename to core/src/main/web/hicc/images/cancel.png
Binary files differ
diff --git a/src/main/web/hicc/images/chukwa.jpg b/core/src/main/web/hicc/images/chukwa.jpg
similarity index 100%
rename from src/main/web/hicc/images/chukwa.jpg
rename to core/src/main/web/hicc/images/chukwa.jpg
Binary files differ
diff --git a/src/main/web/hicc/images/clone.png b/core/src/main/web/hicc/images/clone.png
similarity index 100%
rename from src/main/web/hicc/images/clone.png
rename to core/src/main/web/hicc/images/clone.png
Binary files differ
diff --git a/src/main/web/hicc/images/close.png b/core/src/main/web/hicc/images/close.png
similarity index 100%
rename from src/main/web/hicc/images/close.png
rename to core/src/main/web/hicc/images/close.png
Binary files differ
diff --git a/src/main/web/hicc/images/closebox.png b/core/src/main/web/hicc/images/closebox.png
similarity index 100%
rename from src/main/web/hicc/images/closebox.png
rename to core/src/main/web/hicc/images/closebox.png
Binary files differ
diff --git a/src/main/web/hicc/images/closebox_selected.png b/core/src/main/web/hicc/images/closebox_selected.png
similarity index 100%
rename from src/main/web/hicc/images/closebox_selected.png
rename to core/src/main/web/hicc/images/closebox_selected.png
Binary files differ
diff --git a/src/main/web/hicc/images/collapse.png b/core/src/main/web/hicc/images/collapse.png
similarity index 100%
rename from src/main/web/hicc/images/collapse.png
rename to core/src/main/web/hicc/images/collapse.png
Binary files differ
diff --git a/src/main/web/hicc/images/drive.png b/core/src/main/web/hicc/images/drive.png
similarity index 100%
rename from src/main/web/hicc/images/drive.png
rename to core/src/main/web/hicc/images/drive.png
Binary files differ
diff --git a/src/main/web/hicc/images/end.png b/core/src/main/web/hicc/images/end.png
similarity index 100%
rename from src/main/web/hicc/images/end.png
rename to core/src/main/web/hicc/images/end.png
Binary files differ
diff --git a/src/main/web/hicc/images/grayButton.png b/core/src/main/web/hicc/images/grayButton.png
similarity index 100%
rename from src/main/web/hicc/images/grayButton.png
rename to core/src/main/web/hicc/images/grayButton.png
Binary files differ
diff --git a/src/main/web/hicc/images/handle.png b/core/src/main/web/hicc/images/handle.png
similarity index 100%
rename from src/main/web/hicc/images/handle.png
rename to core/src/main/web/hicc/images/handle.png
Binary files differ
diff --git a/src/main/web/hicc/images/info.png b/core/src/main/web/hicc/images/info.png
similarity index 100%
rename from src/main/web/hicc/images/info.png
rename to core/src/main/web/hicc/images/info.png
Binary files differ
diff --git a/src/main/web/hicc/images/layout_add.png b/core/src/main/web/hicc/images/layout_add.png
similarity index 100%
rename from src/main/web/hicc/images/layout_add.png
rename to core/src/main/web/hicc/images/layout_add.png
Binary files differ
diff --git a/src/main/web/hicc/images/layout_delete.png b/core/src/main/web/hicc/images/layout_delete.png
similarity index 100%
rename from src/main/web/hicc/images/layout_delete.png
rename to core/src/main/web/hicc/images/layout_delete.png
Binary files differ
diff --git a/src/main/web/hicc/images/listGroup.png b/core/src/main/web/hicc/images/listGroup.png
similarity index 100%
rename from src/main/web/hicc/images/listGroup.png
rename to core/src/main/web/hicc/images/listGroup.png
Binary files differ
diff --git a/src/main/web/hicc/images/loading.gif b/core/src/main/web/hicc/images/loading.gif
similarity index 100%
rename from src/main/web/hicc/images/loading.gif
rename to core/src/main/web/hicc/images/loading.gif
Binary files differ
diff --git a/src/main/web/hicc/images/loading.svg b/core/src/main/web/hicc/images/loading.svg
similarity index 100%
rename from src/main/web/hicc/images/loading.svg
rename to core/src/main/web/hicc/images/loading.svg
diff --git a/src/main/web/hicc/images/pinstripes.png b/core/src/main/web/hicc/images/pinstripes.png
similarity index 100%
rename from src/main/web/hicc/images/pinstripes.png
rename to core/src/main/web/hicc/images/pinstripes.png
Binary files differ
diff --git a/src/main/web/hicc/images/refresh.png b/core/src/main/web/hicc/images/refresh.png
similarity index 100%
rename from src/main/web/hicc/images/refresh.png
rename to core/src/main/web/hicc/images/refresh.png
Binary files differ
diff --git a/src/main/web/hicc/images/select_arrow.gif b/core/src/main/web/hicc/images/select_arrow.gif
similarity index 100%
rename from src/main/web/hicc/images/select_arrow.gif
rename to core/src/main/web/hicc/images/select_arrow.gif
Binary files differ
diff --git a/src/main/web/hicc/images/selection.png b/core/src/main/web/hicc/images/selection.png
similarity index 100%
rename from src/main/web/hicc/images/selection.png
rename to core/src/main/web/hicc/images/selection.png
Binary files differ
diff --git a/src/main/web/hicc/images/server_link.png b/core/src/main/web/hicc/images/server_link.png
similarity index 100%
rename from src/main/web/hicc/images/server_link.png
rename to core/src/main/web/hicc/images/server_link.png
Binary files differ
diff --git a/src/main/web/hicc/images/slider-images-handle.png b/core/src/main/web/hicc/images/slider-images-handle.png
similarity index 100%
rename from src/main/web/hicc/images/slider-images-handle.png
rename to core/src/main/web/hicc/images/slider-images-handle.png
Binary files differ
diff --git a/src/main/web/hicc/images/slider-images-handle2.png b/core/src/main/web/hicc/images/slider-images-handle2.png
similarity index 100%
rename from src/main/web/hicc/images/slider-images-handle2.png
rename to core/src/main/web/hicc/images/slider-images-handle2.png
Binary files differ
diff --git a/src/main/web/hicc/images/slider-images-track-left.png b/core/src/main/web/hicc/images/slider-images-track-left.png
similarity index 100%
rename from src/main/web/hicc/images/slider-images-track-left.png
rename to core/src/main/web/hicc/images/slider-images-track-left.png
Binary files differ
diff --git a/src/main/web/hicc/images/start.png b/core/src/main/web/hicc/images/start.png
similarity index 100%
rename from src/main/web/hicc/images/start.png
rename to core/src/main/web/hicc/images/start.png
Binary files differ
diff --git a/src/main/web/hicc/images/startend.png b/core/src/main/web/hicc/images/startend.png
similarity index 100%
rename from src/main/web/hicc/images/startend.png
rename to core/src/main/web/hicc/images/startend.png
Binary files differ
diff --git a/src/main/web/hicc/images/stop.png b/core/src/main/web/hicc/images/stop.png
similarity index 100%
rename from src/main/web/hicc/images/stop.png
rename to core/src/main/web/hicc/images/stop.png
Binary files differ
diff --git a/src/main/web/hicc/images/tab_add.png b/core/src/main/web/hicc/images/tab_add.png
similarity index 100%
rename from src/main/web/hicc/images/tab_add.png
rename to core/src/main/web/hicc/images/tab_add.png
Binary files differ
diff --git a/src/main/web/hicc/images/tab_delete.png b/core/src/main/web/hicc/images/tab_delete.png
similarity index 100%
rename from src/main/web/hicc/images/tab_delete.png
rename to core/src/main/web/hicc/images/tab_delete.png
Binary files differ
diff --git a/src/main/web/hicc/images/table.png b/core/src/main/web/hicc/images/table.png
similarity index 100%
rename from src/main/web/hicc/images/table.png
rename to core/src/main/web/hicc/images/table.png
Binary files differ
diff --git a/src/main/web/hicc/images/thumb.png b/core/src/main/web/hicc/images/thumb.png
similarity index 100%
rename from src/main/web/hicc/images/thumb.png
rename to core/src/main/web/hicc/images/thumb.png
Binary files differ
diff --git a/src/main/web/hicc/images/toggle.png b/core/src/main/web/hicc/images/toggle.png
similarity index 100%
rename from src/main/web/hicc/images/toggle.png
rename to core/src/main/web/hicc/images/toggle.png
Binary files differ
diff --git a/src/main/web/hicc/images/toggleOn.png b/core/src/main/web/hicc/images/toggleOn.png
similarity index 100%
rename from src/main/web/hicc/images/toggleOn.png
rename to core/src/main/web/hicc/images/toggleOn.png
Binary files differ
diff --git a/src/main/web/hicc/images/toolButton.png b/core/src/main/web/hicc/images/toolButton.png
similarity index 100%
rename from src/main/web/hicc/images/toolButton.png
rename to core/src/main/web/hicc/images/toolButton.png
Binary files differ
diff --git a/src/main/web/hicc/images/toolbar.png b/core/src/main/web/hicc/images/toolbar.png
similarity index 100%
rename from src/main/web/hicc/images/toolbar.png
rename to core/src/main/web/hicc/images/toolbar.png
Binary files differ
diff --git a/src/main/web/hicc/images/whiteButton.png b/core/src/main/web/hicc/images/whiteButton.png
similarity index 100%
rename from src/main/web/hicc/images/whiteButton.png
rename to core/src/main/web/hicc/images/whiteButton.png
Binary files differ
diff --git a/src/main/web/hicc/index.html b/core/src/main/web/hicc/index.html
similarity index 100%
rename from src/main/web/hicc/index.html
rename to core/src/main/web/hicc/index.html
diff --git a/src/main/web/hicc/js/activity.js b/core/src/main/web/hicc/js/activity.js
similarity index 100%
rename from src/main/web/hicc/js/activity.js
rename to core/src/main/web/hicc/js/activity.js
diff --git a/src/main/web/hicc/js/ajaxtree.js b/core/src/main/web/hicc/js/ajaxtree.js
similarity index 100%
rename from src/main/web/hicc/js/ajaxtree.js
rename to core/src/main/web/hicc/js/ajaxtree.js
diff --git a/src/main/web/hicc/js/autoHeight.js b/core/src/main/web/hicc/js/autoHeight.js
similarity index 100%
rename from src/main/web/hicc/js/autoHeight.js
rename to core/src/main/web/hicc/js/autoHeight.js
diff --git a/src/main/web/hicc/js/base64.js b/core/src/main/web/hicc/js/base64.js
similarity index 100%
rename from src/main/web/hicc/js/base64.js
rename to core/src/main/web/hicc/js/base64.js
diff --git a/src/main/web/hicc/js/behaviour.js b/core/src/main/web/hicc/js/behaviour.js
similarity index 100%
rename from src/main/web/hicc/js/behaviour.js
rename to core/src/main/web/hicc/js/behaviour.js
diff --git a/src/main/web/hicc/js/bootstrap.min.js b/core/src/main/web/hicc/js/bootstrap.min.js
similarity index 100%
rename from src/main/web/hicc/js/bootstrap.min.js
rename to core/src/main/web/hicc/js/bootstrap.min.js
diff --git a/src/main/web/hicc/js/canvas2image.js b/core/src/main/web/hicc/js/canvas2image.js
similarity index 100%
rename from src/main/web/hicc/js/canvas2image.js
rename to core/src/main/web/hicc/js/canvas2image.js
diff --git a/src/main/web/hicc/js/chartist.min.js b/core/src/main/web/hicc/js/chartist.min.js
similarity index 100%
rename from src/main/web/hicc/js/chartist.min.js
rename to core/src/main/web/hicc/js/chartist.min.js
diff --git a/src/main/web/hicc/js/chartist.min.js.map b/core/src/main/web/hicc/js/chartist.min.js.map
similarity index 100%
rename from src/main/web/hicc/js/chartist.min.js.map
rename to core/src/main/web/hicc/js/chartist.min.js.map
diff --git a/src/main/web/hicc/js/excanvas.pack.js b/core/src/main/web/hicc/js/excanvas.pack.js
similarity index 100%
rename from src/main/web/hicc/js/excanvas.pack.js
rename to core/src/main/web/hicc/js/excanvas.pack.js
diff --git a/src/main/web/hicc/js/flexigrid.js b/core/src/main/web/hicc/js/flexigrid.js
similarity index 100%
rename from src/main/web/hicc/js/flexigrid.js
rename to core/src/main/web/hicc/js/flexigrid.js
diff --git a/src/main/web/hicc/js/flexigrid.pack.js b/core/src/main/web/hicc/js/flexigrid.pack.js
similarity index 100%
rename from src/main/web/hicc/js/flexigrid.pack.js
rename to core/src/main/web/hicc/js/flexigrid.pack.js
diff --git a/src/main/web/hicc/js/flot.extend.js b/core/src/main/web/hicc/js/flot.extend.js
similarity index 100%
rename from src/main/web/hicc/js/flot.extend.js
rename to core/src/main/web/hicc/js/flot.extend.js
diff --git a/src/main/web/hicc/js/gsv.js b/core/src/main/web/hicc/js/gsv.js
similarity index 100%
rename from src/main/web/hicc/js/gsv.js
rename to core/src/main/web/hicc/js/gsv.js
diff --git a/src/main/web/hicc/js/heatmap.js b/core/src/main/web/hicc/js/heatmap.js
similarity index 100%
rename from src/main/web/hicc/js/heatmap.js
rename to core/src/main/web/hicc/js/heatmap.js
diff --git a/src/main/web/hicc/js/host_selector.js b/core/src/main/web/hicc/js/host_selector.js
similarity index 100%
rename from src/main/web/hicc/js/host_selector.js
rename to core/src/main/web/hicc/js/host_selector.js
diff --git a/src/main/web/hicc/js/iui.js b/core/src/main/web/hicc/js/iui.js
similarity index 100%
rename from src/main/web/hicc/js/iui.js
rename to core/src/main/web/hicc/js/iui.js
diff --git a/src/main/web/hicc/js/jquery-1.2.6.min.js b/core/src/main/web/hicc/js/jquery-1.2.6.min.js
similarity index 100%
rename from src/main/web/hicc/js/jquery-1.2.6.min.js
rename to core/src/main/web/hicc/js/jquery-1.2.6.min.js
diff --git a/src/main/web/hicc/js/jquery-1.3.2.min.js b/core/src/main/web/hicc/js/jquery-1.3.2.min.js
similarity index 100%
rename from src/main/web/hicc/js/jquery-1.3.2.min.js
rename to core/src/main/web/hicc/js/jquery-1.3.2.min.js
diff --git a/src/main/web/hicc/js/jquery.circliful.min.js b/core/src/main/web/hicc/js/jquery.circliful.min.js
similarity index 100%
rename from src/main/web/hicc/js/jquery.circliful.min.js
rename to core/src/main/web/hicc/js/jquery.circliful.min.js
diff --git a/src/main/web/hicc/js/jquery.flot.pack.js b/core/src/main/web/hicc/js/jquery.flot.pack.js
similarity index 100%
rename from src/main/web/hicc/js/jquery.flot.pack.js
rename to core/src/main/web/hicc/js/jquery.flot.pack.js
diff --git a/src/main/web/hicc/js/jquery.formalize.js b/core/src/main/web/hicc/js/jquery.formalize.js
similarity index 100%
rename from src/main/web/hicc/js/jquery.formalize.js
rename to core/src/main/web/hicc/js/jquery.formalize.js
diff --git a/src/main/web/hicc/js/jquery.js b/core/src/main/web/hicc/js/jquery.js
similarity index 100%
rename from src/main/web/hicc/js/jquery.js
rename to core/src/main/web/hicc/js/jquery.js
diff --git a/src/main/web/hicc/js/js-cookie.js b/core/src/main/web/hicc/js/js-cookie.js
similarity index 100%
rename from src/main/web/hicc/js/js-cookie.js
rename to core/src/main/web/hicc/js/js-cookie.js
diff --git a/src/main/web/hicc/js/json.js b/core/src/main/web/hicc/js/json.js
similarity index 100%
rename from src/main/web/hicc/js/json.js
rename to core/src/main/web/hicc/js/json.js
diff --git a/src/main/web/hicc/js/org/tool-man/cookies.js b/core/src/main/web/hicc/js/org/tool-man/cookies.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/cookies.js
rename to core/src/main/web/hicc/js/org/tool-man/cookies.js
diff --git a/src/main/web/hicc/js/org/tool-man/coordinates.js b/core/src/main/web/hicc/js/org/tool-man/coordinates.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/coordinates.js
rename to core/src/main/web/hicc/js/org/tool-man/coordinates.js
diff --git a/src/main/web/hicc/js/org/tool-man/core.js b/core/src/main/web/hicc/js/org/tool-man/core.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/core.js
rename to core/src/main/web/hicc/js/org/tool-man/core.js
diff --git a/src/main/web/hicc/js/org/tool-man/core.js.old b/core/src/main/web/hicc/js/org/tool-man/core.js.old
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/core.js.old
rename to core/src/main/web/hicc/js/org/tool-man/core.js.old
diff --git a/src/main/web/hicc/js/org/tool-man/css.js b/core/src/main/web/hicc/js/org/tool-man/css.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/css.js
rename to core/src/main/web/hicc/js/org/tool-man/css.js
diff --git a/src/main/web/hicc/js/org/tool-man/drag.js b/core/src/main/web/hicc/js/org/tool-man/drag.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/drag.js
rename to core/src/main/web/hicc/js/org/tool-man/drag.js
diff --git a/src/main/web/hicc/js/org/tool-man/dragsort.js b/core/src/main/web/hicc/js/org/tool-man/dragsort.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/dragsort.js
rename to core/src/main/web/hicc/js/org/tool-man/dragsort.js
diff --git a/src/main/web/hicc/js/org/tool-man/events.js b/core/src/main/web/hicc/js/org/tool-man/events.js
similarity index 100%
rename from src/main/web/hicc/js/org/tool-man/events.js
rename to core/src/main/web/hicc/js/org/tool-man/events.js
diff --git a/src/main/web/hicc/js/pie.js b/core/src/main/web/hicc/js/pie.js
similarity index 100%
rename from src/main/web/hicc/js/pie.js
rename to core/src/main/web/hicc/js/pie.js
diff --git a/src/main/web/hicc/js/processing.js b/core/src/main/web/hicc/js/processing.js
similarity index 100%
rename from src/main/web/hicc/js/processing.js
rename to core/src/main/web/hicc/js/processing.js
diff --git a/src/main/web/hicc/js/time.js b/core/src/main/web/hicc/js/time.js
similarity index 100%
rename from src/main/web/hicc/js/time.js
rename to core/src/main/web/hicc/js/time.js
diff --git a/src/main/web/hicc/js/timeframe.js b/core/src/main/web/hicc/js/timeframe.js
similarity index 100%
rename from src/main/web/hicc/js/timeframe.js
rename to core/src/main/web/hicc/js/timeframe.js
diff --git a/src/main/web/hicc/js/treeview-min.js b/core/src/main/web/hicc/js/treeview-min.js
similarity index 100%
rename from src/main/web/hicc/js/treeview-min.js
rename to core/src/main/web/hicc/js/treeview-min.js
diff --git a/src/main/web/hicc/js/workspace/builder.js b/core/src/main/web/hicc/js/workspace/builder.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/builder.js
rename to core/src/main/web/hicc/js/workspace/builder.js
diff --git a/src/main/web/hicc/js/workspace/controls.js b/core/src/main/web/hicc/js/workspace/controls.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/controls.js
rename to core/src/main/web/hicc/js/workspace/controls.js
diff --git a/src/main/web/hicc/js/workspace/custom_edits.js b/core/src/main/web/hicc/js/workspace/custom_edits.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/custom_edits.js
rename to core/src/main/web/hicc/js/workspace/custom_edits.js
diff --git a/src/main/web/hicc/js/workspace/dragdrop.js b/core/src/main/web/hicc/js/workspace/dragdrop.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/dragdrop.js
rename to core/src/main/web/hicc/js/workspace/dragdrop.js
diff --git a/src/main/web/hicc/js/workspace/effects.js b/core/src/main/web/hicc/js/workspace/effects.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/effects.js
rename to core/src/main/web/hicc/js/workspace/effects.js
diff --git a/src/main/web/hicc/js/workspace/prototype.js b/core/src/main/web/hicc/js/workspace/prototype.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/prototype.js
rename to core/src/main/web/hicc/js/workspace/prototype.js
diff --git a/src/main/web/hicc/js/workspace/scriptaculous.js b/core/src/main/web/hicc/js/workspace/scriptaculous.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/scriptaculous.js
rename to core/src/main/web/hicc/js/workspace/scriptaculous.js
diff --git a/src/main/web/hicc/js/workspace/slider.js b/core/src/main/web/hicc/js/workspace/slider.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/slider.js
rename to core/src/main/web/hicc/js/workspace/slider.js
diff --git a/src/main/web/hicc/js/workspace/sound.js b/core/src/main/web/hicc/js/workspace/sound.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/sound.js
rename to core/src/main/web/hicc/js/workspace/sound.js
diff --git a/src/main/web/hicc/js/workspace/workspace.js b/core/src/main/web/hicc/js/workspace/workspace.js
similarity index 100%
rename from src/main/web/hicc/js/workspace/workspace.js
rename to core/src/main/web/hicc/js/workspace/workspace.js
diff --git a/src/main/web/hicc/js/yahoo-dom-event.js b/core/src/main/web/hicc/js/yahoo-dom-event.js
similarity index 100%
rename from src/main/web/hicc/js/yahoo-dom-event.js
rename to core/src/main/web/hicc/js/yahoo-dom-event.js
diff --git a/src/main/web/hicc/lib/timeline/bundle.css b/core/src/main/web/hicc/lib/timeline/bundle.css
similarity index 100%
rename from src/main/web/hicc/lib/timeline/bundle.css
rename to core/src/main/web/hicc/lib/timeline/bundle.css
diff --git a/src/main/web/hicc/lib/timeline/bundle.js b/core/src/main/web/hicc/lib/timeline/bundle.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/bundle.js
rename to core/src/main/web/hicc/lib/timeline/bundle.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/geochrono-api.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/geochrono-api.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/geochrono-api.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/geochrono-api.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/ether-painters.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/ether-painters.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/scripts/ether-painters.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/ether-painters.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/geochrono.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/geochrono.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/scripts/geochrono.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/geochrono.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/l10n/en/labellers.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/l10n/en/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/scripts/l10n/en/labellers.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/l10n/en/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/labellers.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/scripts/labellers.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/units.js b/core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/units.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/geochrono/scripts/units.js
rename to core/src/main/web/hicc/lib/timeline/ext/geochrono/scripts/units.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/planning-api.js b/core/src/main/web/hicc/lib/timeline/ext/planning/planning-api.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/planning-api.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/planning-api.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/scripts/ether-painters.js b/core/src/main/web/hicc/lib/timeline/ext/planning/scripts/ether-painters.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/scripts/ether-painters.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/scripts/ether-painters.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/scripts/l10n/en/labellers.js b/core/src/main/web/hicc/lib/timeline/ext/planning/scripts/l10n/en/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/scripts/l10n/en/labellers.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/scripts/l10n/en/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/scripts/labellers.js b/core/src/main/web/hicc/lib/timeline/ext/planning/scripts/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/scripts/labellers.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/scripts/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/scripts/planning.js b/core/src/main/web/hicc/lib/timeline/ext/planning/scripts/planning.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/scripts/planning.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/scripts/planning.js
diff --git a/src/main/web/hicc/lib/timeline/ext/planning/scripts/units.js b/core/src/main/web/hicc/lib/timeline/ext/planning/scripts/units.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/ext/planning/scripts/units.js
rename to core/src/main/web/hicc/lib/timeline/ext/planning/scripts/units.js
diff --git a/src/main/web/hicc/lib/timeline/images/blue-circle.png b/core/src/main/web/hicc/lib/timeline/images/blue-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/blue-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/blue-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-bottom-arrow.png b/core/src/main/web/hicc/lib/timeline/images/bubble-bottom-arrow.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-bottom-arrow.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-bottom-arrow.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-bottom-left.png b/core/src/main/web/hicc/lib/timeline/images/bubble-bottom-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-bottom-left.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-bottom-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-bottom-right.png b/core/src/main/web/hicc/lib/timeline/images/bubble-bottom-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-bottom-right.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-bottom-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-bottom.png b/core/src/main/web/hicc/lib/timeline/images/bubble-bottom.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-bottom.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-bottom.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-left-arrow.png b/core/src/main/web/hicc/lib/timeline/images/bubble-left-arrow.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-left-arrow.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-left-arrow.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-left.png b/core/src/main/web/hicc/lib/timeline/images/bubble-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-left.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-right-arrow.png b/core/src/main/web/hicc/lib/timeline/images/bubble-right-arrow.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-right-arrow.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-right-arrow.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-right.png b/core/src/main/web/hicc/lib/timeline/images/bubble-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-right.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-top-arrow.png b/core/src/main/web/hicc/lib/timeline/images/bubble-top-arrow.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-top-arrow.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-top-arrow.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-top-left.png b/core/src/main/web/hicc/lib/timeline/images/bubble-top-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-top-left.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-top-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-top-right.png b/core/src/main/web/hicc/lib/timeline/images/bubble-top-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-top-right.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-top-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/bubble-top.png b/core/src/main/web/hicc/lib/timeline/images/bubble-top.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/bubble-top.png
rename to core/src/main/web/hicc/lib/timeline/images/bubble-top.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/close-button.png b/core/src/main/web/hicc/lib/timeline/images/close-button.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/close-button.png
rename to core/src/main/web/hicc/lib/timeline/images/close-button.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/copyright-vertical.png b/core/src/main/web/hicc/lib/timeline/images/copyright-vertical.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/copyright-vertical.png
rename to core/src/main/web/hicc/lib/timeline/images/copyright-vertical.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/copyright.png b/core/src/main/web/hicc/lib/timeline/images/copyright.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/copyright.png
rename to core/src/main/web/hicc/lib/timeline/images/copyright.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dark-blue-circle.png b/core/src/main/web/hicc/lib/timeline/images/dark-blue-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dark-blue-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dark-blue-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dark-green-circle.png b/core/src/main/web/hicc/lib/timeline/images/dark-green-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dark-green-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dark-green-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dark-red-circle.png b/core/src/main/web/hicc/lib/timeline/images/dark-red-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dark-red-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dark-red-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dull-blue-circle.png b/core/src/main/web/hicc/lib/timeline/images/dull-blue-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dull-blue-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dull-blue-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dull-green-circle.png b/core/src/main/web/hicc/lib/timeline/images/dull-green-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dull-green-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dull-green-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/dull-red-circle.png b/core/src/main/web/hicc/lib/timeline/images/dull-red-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/dull-red-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/dull-red-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/gray-circle.png b/core/src/main/web/hicc/lib/timeline/images/gray-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/gray-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/gray-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/green-circle.png b/core/src/main/web/hicc/lib/timeline/images/green-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/green-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/green-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-bottom-left.png b/core/src/main/web/hicc/lib/timeline/images/message-bottom-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-bottom-left.png
rename to core/src/main/web/hicc/lib/timeline/images/message-bottom-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-bottom-right.png b/core/src/main/web/hicc/lib/timeline/images/message-bottom-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-bottom-right.png
rename to core/src/main/web/hicc/lib/timeline/images/message-bottom-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-left.png b/core/src/main/web/hicc/lib/timeline/images/message-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-left.png
rename to core/src/main/web/hicc/lib/timeline/images/message-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-right.png b/core/src/main/web/hicc/lib/timeline/images/message-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-right.png
rename to core/src/main/web/hicc/lib/timeline/images/message-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-top-left.png b/core/src/main/web/hicc/lib/timeline/images/message-top-left.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-top-left.png
rename to core/src/main/web/hicc/lib/timeline/images/message-top-left.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/message-top-right.png b/core/src/main/web/hicc/lib/timeline/images/message-top-right.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/message-top-right.png
rename to core/src/main/web/hicc/lib/timeline/images/message-top-right.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/progress-running.gif b/core/src/main/web/hicc/lib/timeline/images/progress-running.gif
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/progress-running.gif
rename to core/src/main/web/hicc/lib/timeline/images/progress-running.gif
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/red-circle.png b/core/src/main/web/hicc/lib/timeline/images/red-circle.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/red-circle.png
rename to core/src/main/web/hicc/lib/timeline/images/red-circle.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/images/top-bubble.png b/core/src/main/web/hicc/lib/timeline/images/top-bubble.png
similarity index 100%
rename from src/main/web/hicc/lib/timeline/images/top-bubble.png
rename to core/src/main/web/hicc/lib/timeline/images/top-bubble.png
Binary files differ
diff --git a/src/main/web/hicc/lib/timeline/scripts/decorators.js b/core/src/main/web/hicc/lib/timeline/scripts/decorators.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/decorators.js
rename to core/src/main/web/hicc/lib/timeline/scripts/decorators.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/ether-painters.js b/core/src/main/web/hicc/lib/timeline/scripts/ether-painters.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/ether-painters.js
rename to core/src/main/web/hicc/lib/timeline/scripts/ether-painters.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/ethers.js b/core/src/main/web/hicc/lib/timeline/scripts/ethers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/ethers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/ethers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/ext/japanese-eras.js b/core/src/main/web/hicc/lib/timeline/scripts/ext/japanese-eras.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/ext/japanese-eras.js
rename to core/src/main/web/hicc/lib/timeline/scripts/ext/japanese-eras.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/cs/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/cs/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/cs/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/cs/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/cs/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/cs/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/cs/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/cs/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/de/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/de/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/de/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/de/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/de/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/de/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/de/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/de/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/en/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/en/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/en/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/en/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/en/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/en/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/en/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/en/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/es/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/es/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/es/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/es/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/es/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/es/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/es/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/es/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/fr/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/fr/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/fr/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/fr/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/fr/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/fr/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/fr/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/fr/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/it/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/it/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/it/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/it/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/it/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/it/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/it/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/it/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/ru/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/ru/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/ru/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/ru/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/ru/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/ru/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/ru/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/ru/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/se/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/se/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/se/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/se/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/se/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/se/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/se/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/se/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/vi/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/vi/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/vi/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/vi/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/vi/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/vi/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/vi/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/vi/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/zh/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/zh/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/zh/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/zh/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/l10n/zh/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/l10n/zh/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/l10n/zh/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/l10n/zh/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/labellers.js b/core/src/main/web/hicc/lib/timeline/scripts/labellers.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/labellers.js
rename to core/src/main/web/hicc/lib/timeline/scripts/labellers.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/layouts.js b/core/src/main/web/hicc/lib/timeline/scripts/layouts.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/layouts.js
rename to core/src/main/web/hicc/lib/timeline/scripts/layouts.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/painters.js b/core/src/main/web/hicc/lib/timeline/scripts/painters.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/painters.js
rename to core/src/main/web/hicc/lib/timeline/scripts/painters.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/sources.js b/core/src/main/web/hicc/lib/timeline/scripts/sources.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/sources.js
rename to core/src/main/web/hicc/lib/timeline/scripts/sources.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/themes.js b/core/src/main/web/hicc/lib/timeline/scripts/themes.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/themes.js
rename to core/src/main/web/hicc/lib/timeline/scripts/themes.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/timeline.js b/core/src/main/web/hicc/lib/timeline/scripts/timeline.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/timeline.js
rename to core/src/main/web/hicc/lib/timeline/scripts/timeline.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/units.js b/core/src/main/web/hicc/lib/timeline/scripts/units.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/units.js
rename to core/src/main/web/hicc/lib/timeline/scripts/units.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/data-structure.js b/core/src/main/web/hicc/lib/timeline/scripts/util/data-structure.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/data-structure.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/data-structure.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/date-time.js b/core/src/main/web/hicc/lib/timeline/scripts/util/date-time.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/date-time.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/date-time.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/debug.js b/core/src/main/web/hicc/lib/timeline/scripts/util/debug.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/debug.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/debug.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/dom.js b/core/src/main/web/hicc/lib/timeline/scripts/util/dom.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/dom.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/dom.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/graphics.js b/core/src/main/web/hicc/lib/timeline/scripts/util/graphics.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/graphics.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/graphics.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/html.js b/core/src/main/web/hicc/lib/timeline/scripts/util/html.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/html.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/html.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/platform.js b/core/src/main/web/hicc/lib/timeline/scripts/util/platform.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/platform.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/platform.js
diff --git a/src/main/web/hicc/lib/timeline/scripts/util/xmlhttp.js b/core/src/main/web/hicc/lib/timeline/scripts/util/xmlhttp.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/scripts/util/xmlhttp.js
rename to core/src/main/web/hicc/lib/timeline/scripts/util/xmlhttp.js
diff --git a/src/main/web/hicc/lib/timeline/search.js b/core/src/main/web/hicc/lib/timeline/search.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/search.js
rename to core/src/main/web/hicc/lib/timeline/search.js
diff --git a/src/main/web/hicc/lib/timeline/styles/ethers.css b/core/src/main/web/hicc/lib/timeline/styles/ethers.css
similarity index 100%
rename from src/main/web/hicc/lib/timeline/styles/ethers.css
rename to core/src/main/web/hicc/lib/timeline/styles/ethers.css
diff --git a/src/main/web/hicc/lib/timeline/styles/events.css b/core/src/main/web/hicc/lib/timeline/styles/events.css
similarity index 100%
rename from src/main/web/hicc/lib/timeline/styles/events.css
rename to core/src/main/web/hicc/lib/timeline/styles/events.css
diff --git a/src/main/web/hicc/lib/timeline/styles/timeline.css b/core/src/main/web/hicc/lib/timeline/styles/timeline.css
similarity index 100%
rename from src/main/web/hicc/lib/timeline/styles/timeline.css
rename to core/src/main/web/hicc/lib/timeline/styles/timeline.css
diff --git a/src/main/web/hicc/lib/timeline/timeline-api.js b/core/src/main/web/hicc/lib/timeline/timeline-api.js
similarity index 100%
rename from src/main/web/hicc/lib/timeline/timeline-api.js
rename to core/src/main/web/hicc/lib/timeline/timeline-api.js
diff --git a/src/main/web/hicc/loading.html b/core/src/main/web/hicc/loading.html
similarity index 100%
rename from src/main/web/hicc/loading.html
rename to core/src/main/web/hicc/loading.html
diff --git a/src/main/web/hicc/logs/index.html b/core/src/main/web/hicc/logs/index.html
similarity index 100%
rename from src/main/web/hicc/logs/index.html
rename to core/src/main/web/hicc/logs/index.html
diff --git a/src/main/web/hicc/services/services.html b/core/src/main/web/hicc/services/services.html
similarity index 100%
rename from src/main/web/hicc/services/services.html
rename to core/src/main/web/hicc/services/services.html
diff --git a/src/main/web/hicc/timeline/css/styles.css b/core/src/main/web/hicc/timeline/css/styles.css
similarity index 100%
rename from src/main/web/hicc/timeline/css/styles.css
rename to core/src/main/web/hicc/timeline/css/styles.css
diff --git a/src/main/web/hicc/timeline/index.html b/core/src/main/web/hicc/timeline/index.html
similarity index 100%
rename from src/main/web/hicc/timeline/index.html
rename to core/src/main/web/hicc/timeline/index.html
diff --git a/src/main/web/hicc/timeline/js/main.js b/core/src/main/web/hicc/timeline/js/main.js
similarity index 100%
rename from src/main/web/hicc/timeline/js/main.js
rename to core/src/main/web/hicc/timeline/js/main.js
diff --git a/src/main/web/hicc/users/index.html b/core/src/main/web/hicc/users/index.html
similarity index 100%
rename from src/main/web/hicc/users/index.html
rename to core/src/main/web/hicc/users/index.html
diff --git a/src/main/web/hicc/views/default.view b/core/src/main/web/hicc/views/default.view
similarity index 100%
rename from src/main/web/hicc/views/default.view
rename to core/src/main/web/hicc/views/default.view
diff --git a/src/main/web/hicc/views/newview.tpl b/core/src/main/web/hicc/views/newview.tpl
similarity index 100%
rename from src/main/web/hicc/views/newview.tpl
rename to core/src/main/web/hicc/views/newview.tpl
diff --git a/src/main/web/hicc/views/view.permission b/core/src/main/web/hicc/views/view.permission
similarity index 100%
rename from src/main/web/hicc/views/view.permission
rename to core/src/main/web/hicc/views/view.permission
diff --git a/src/main/web/hicc/views/workspace_view_list.cache b/core/src/main/web/hicc/views/workspace_view_list.cache
similarity index 100%
rename from src/main/web/hicc/views/workspace_view_list.cache
rename to core/src/main/web/hicc/views/workspace_view_list.cache
diff --git a/src/main/web/hicc/welcome.html b/core/src/main/web/hicc/welcome.html
similarity index 100%
rename from src/main/web/hicc/welcome.html
rename to core/src/main/web/hicc/welcome.html
diff --git a/src/main/webapps/wadl.xsl b/core/src/main/webapps/wadl.xsl
similarity index 100%
rename from src/main/webapps/wadl.xsl
rename to core/src/main/webapps/wadl.xsl
diff --git a/src/packages/rpm/specs/chukwa.spec b/core/src/packages/rpm/specs/chukwa.spec
similarity index 100%
rename from src/packages/rpm/specs/chukwa.spec
rename to core/src/packages/rpm/specs/chukwa.spec
diff --git a/src/packages/tarball/all.xml b/core/src/packages/tarball/all.xml
similarity index 100%
rename from src/packages/tarball/all.xml
rename to core/src/packages/tarball/all.xml
diff --git a/src/packages/tarball/src.xml b/core/src/packages/tarball/src.xml
similarity index 100%
rename from src/packages/tarball/src.xml
rename to core/src/packages/tarball/src.xml
diff --git a/src/site/apt/Quick_Start_Guide.apt.vm b/core/src/site/apt/Quick_Start_Guide.apt.vm
similarity index 100%
rename from src/site/apt/Quick_Start_Guide.apt.vm
rename to core/src/site/apt/Quick_Start_Guide.apt.vm
diff --git a/src/site/apt/agent.apt b/core/src/site/apt/agent.apt
similarity index 100%
rename from src/site/apt/agent.apt
rename to core/src/site/apt/agent.apt
diff --git a/src/site/apt/async_ack.apt b/core/src/site/apt/async_ack.apt
similarity index 100%
rename from src/site/apt/async_ack.apt
rename to core/src/site/apt/async_ack.apt
diff --git a/src/site/apt/dataflow.apt b/core/src/site/apt/dataflow.apt
similarity index 100%
rename from src/site/apt/dataflow.apt
rename to core/src/site/apt/dataflow.apt
diff --git a/src/site/apt/datamodel.apt b/core/src/site/apt/datamodel.apt
similarity index 100%
rename from src/site/apt/datamodel.apt
rename to core/src/site/apt/datamodel.apt
diff --git a/src/site/apt/design.apt b/core/src/site/apt/design.apt
similarity index 100%
rename from src/site/apt/design.apt
rename to core/src/site/apt/design.apt
diff --git a/src/site/apt/index.apt b/core/src/site/apt/index.apt
similarity index 100%
rename from src/site/apt/index.apt
rename to core/src/site/apt/index.apt
diff --git a/src/site/apt/pipeline.apt b/core/src/site/apt/pipeline.apt
similarity index 100%
rename from src/site/apt/pipeline.apt
rename to core/src/site/apt/pipeline.apt
diff --git a/src/site/apt/programming.apt b/core/src/site/apt/programming.apt
similarity index 100%
rename from src/site/apt/programming.apt
rename to core/src/site/apt/programming.apt
diff --git a/src/site/apt/releasenotes.apt.vm b/core/src/site/apt/releasenotes.apt.vm
similarity index 100%
rename from src/site/apt/releasenotes.apt.vm
rename to core/src/site/apt/releasenotes.apt.vm
diff --git a/src/site/apt/user.apt.vm b/core/src/site/apt/user.apt.vm
similarity index 100%
rename from src/site/apt/user.apt.vm
rename to core/src/site/apt/user.apt.vm
diff --git a/src/site/resources/css/ChangesFancyStyle.css b/core/src/site/resources/css/ChangesFancyStyle.css
similarity index 100%
rename from src/site/resources/css/ChangesFancyStyle.css
rename to core/src/site/resources/css/ChangesFancyStyle.css
diff --git a/src/site/resources/css/ChangesSimpleStyle.css b/core/src/site/resources/css/ChangesSimpleStyle.css
similarity index 100%
rename from src/site/resources/css/ChangesSimpleStyle.css
rename to core/src/site/resources/css/ChangesSimpleStyle.css
diff --git a/src/site/resources/images/apache-incubator-logo.png b/core/src/site/resources/images/apache-incubator-logo.png
similarity index 100%
rename from src/site/resources/images/apache-incubator-logo.png
rename to core/src/site/resources/images/apache-incubator-logo.png
Binary files differ
diff --git a/src/site/resources/images/asf_logo.png b/core/src/site/resources/images/asf_logo.png
similarity index 100%
rename from src/site/resources/images/asf_logo.png
rename to core/src/site/resources/images/asf_logo.png
Binary files differ
diff --git a/src/site/resources/images/chukwa_architecture.png b/core/src/site/resources/images/chukwa_architecture.png
similarity index 100%
rename from src/site/resources/images/chukwa_architecture.png
rename to core/src/site/resources/images/chukwa_architecture.png
Binary files differ
diff --git a/src/site/resources/images/chukwa_logo_small.jpg b/core/src/site/resources/images/chukwa_logo_small.jpg
similarity index 100%
rename from src/site/resources/images/chukwa_logo_small.jpg
rename to core/src/site/resources/images/chukwa_logo_small.jpg
Binary files differ
diff --git a/src/site/resources/images/components.gif b/core/src/site/resources/images/components.gif
similarity index 100%
rename from src/site/resources/images/components.gif
rename to core/src/site/resources/images/components.gif
Binary files differ
diff --git a/src/site/resources/images/datapipeline.png b/core/src/site/resources/images/datapipeline.png
similarity index 100%
rename from src/site/resources/images/datapipeline.png
rename to core/src/site/resources/images/datapipeline.png
Binary files differ
diff --git a/src/site/resources/images/group.svg b/core/src/site/resources/images/group.svg
similarity index 100%
rename from src/site/resources/images/group.svg
rename to core/src/site/resources/images/group.svg
diff --git a/src/site/resources/images/hadoop-logo.jpg b/core/src/site/resources/images/hadoop-logo.jpg
similarity index 100%
rename from src/site/resources/images/hadoop-logo.jpg
rename to core/src/site/resources/images/hadoop-logo.jpg
Binary files differ
diff --git a/src/site/resources/images/hicc-dashboard.png b/core/src/site/resources/images/hicc-dashboard.png
similarity index 100%
rename from src/site/resources/images/hicc-dashboard.png
rename to core/src/site/resources/images/hicc-dashboard.png
Binary files differ
diff --git a/src/site/resources/images/hicc-widget.png b/core/src/site/resources/images/hicc-widget.png
similarity index 100%
rename from src/site/resources/images/hicc-widget.png
rename to core/src/site/resources/images/hicc-widget.png
Binary files differ
diff --git a/src/site/resources/images/project.svg b/core/src/site/resources/images/project.svg
similarity index 100%
rename from src/site/resources/images/project.svg
rename to core/src/site/resources/images/project.svg
diff --git a/src/site/resources/scripts/changes2html.pl b/core/src/site/resources/scripts/changes2html.pl
similarity index 100%
rename from src/site/resources/scripts/changes2html.pl
rename to core/src/site/resources/scripts/changes2html.pl
diff --git a/src/site/site.xml b/core/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to core/src/site/site.xml
diff --git a/src/test/java/org/apache/hadoop/chukwa/ChunkImplTest.java b/core/src/test/java/org/apache/hadoop/chukwa/ChunkImplTest.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/ChunkImplTest.java
rename to core/src/test/java/org/apache/hadoop/chukwa/ChunkImplTest.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/TestChunkBuilder.java b/core/src/test/java/org/apache/hadoop/chukwa/TestChunkBuilder.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/TestChunkBuilder.java
rename to core/src/test/java/org/apache/hadoop/chukwa/TestChunkBuilder.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java b/core/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java
rename to core/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/caffe/ImageCreator.java b/core/src/test/java/org/apache/hadoop/chukwa/caffe/ImageCreator.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/caffe/ImageCreator.java
rename to core/src/test/java/org/apache/hadoop/chukwa/caffe/ImageCreator.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/caffe/MetricsCollector.java b/core/src/test/java/org/apache/hadoop/chukwa/caffe/MetricsCollector.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/caffe/MetricsCollector.java
rename to core/src/test/java/org/apache/hadoop/chukwa/caffe/MetricsCollector.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/caffe/TestMemoryUsageDetection.java b/core/src/test/java/org/apache/hadoop/chukwa/caffe/TestMemoryUsageDetection.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/caffe/TestMemoryUsageDetection.java
rename to core/src/test/java/org/apache/hadoop/chukwa/caffe/TestMemoryUsageDetection.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/DatabaseSetup.java b/core/src/test/java/org/apache/hadoop/chukwa/database/DatabaseSetup.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/DatabaseSetup.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/DatabaseSetup.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseDataExpiration.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseDataExpiration.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseDataExpiration.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseDataExpiration.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestDatabasePrepareStatement.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabasePrepareStatement.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestDatabasePrepareStatement.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabasePrepareStatement.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseTableCreator.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseTableCreator.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseTableCreator.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseTableCreator.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseWebJson.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseWebJson.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseWebJson.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseWebJson.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/database/TestMacro.java b/core/src/test/java/org/apache/hadoop/chukwa/database/TestMacro.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/database/TestMacro.java
rename to core/src/test/java/org/apache/hadoop/chukwa/database/TestMacro.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/ChukwaTestAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/ChukwaTestAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/ChukwaTestAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/ChukwaTestAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/JMXAgent.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/JMXAgent.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/JMXAgent.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/JMXAgent.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBean.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBean.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBean.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBean.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBeanImpl.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBeanImpl.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBeanImpl.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/MXBeanImpl.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/QueueSample.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/QueueSample.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/QueueSample.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/QueueSample.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/TestJMXAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/TestJMXAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/TestJMXAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/JMX/TestJMXAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestAddAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestAddAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestAddAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestAddAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestBufferingWrappers.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestBufferingWrappers.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestBufferingWrappers.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestBufferingWrappers.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestExecAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestFileAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestFileAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestFileAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestFileAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestHeartbeatAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestHeartbeatAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestHeartbeatAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestHeartbeatAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestOozieAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestOozieAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestOozieAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestOozieAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestRestAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestRestAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestRestAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestRestAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSocketAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSyslogAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSyslogAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSyslogAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestSyslogAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestUDPAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestUDPAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestUDPAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestUDPAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestCharFileTailingAdaptorUTF8.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestCharFileTailingAdaptorUTF8.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestCharFileTailingAdaptorUTF8.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestCharFileTailingAdaptorUTF8.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorBigRecord.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorBigRecord.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorBigRecord.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorBigRecord.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorPreserveLines.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorPreserveLines.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorPreserveLines.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptorPreserveLines.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptors.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptors.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptors.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailingAdaptors.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestLogRotate.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestLogRotate.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestLogRotate.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestLogRotate.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRCheckAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRCheckAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRCheckAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRCheckAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRawAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRawAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRawAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestRawAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestStartAtOffset.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestStartAtOffset.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestStartAtOffset.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestStartAtOffset.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSAdaptor.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSAdaptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSAdaptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSAdaptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSMessagePropertyTransformer.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSMessagePropertyTransformer.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSMessagePropertyTransformer.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/jms/TestJMSMessagePropertyTransformer.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgent.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgent.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgent.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgent.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgentConfig.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgentConfig.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgentConfig.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestAgentConfig.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChukwaSsl.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChukwaSsl.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChukwaSsl.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChukwaSsl.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChunkQueue.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChunkQueue.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChunkQueue.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestChunkQueue.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestCmd.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestCmd.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestCmd.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/TestCmd.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/rest/TestAdaptorController.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/rest/TestAdaptorController.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/agent/rest/TestAdaptorController.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/agent/rest/TestAdaptorController.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/CaptureWriter.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/CaptureWriter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/collector/CaptureWriter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/CaptureWriter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestAdaptorTimeout.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestAdaptorTimeout.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestAdaptorTimeout.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestAdaptorTimeout.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestBackpressure.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestBackpressure.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestBackpressure.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestBackpressure.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestDelayedAcks.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestDelayedAcks.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestDelayedAcks.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestDelayedAcks.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestFailedCollectorAck.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestFailedCollectorAck.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestFailedCollectorAck.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/collector/TestFailedCollectorAck.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/connector/TestFailedCollector.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/connector/TestFailedCollector.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/connector/TestFailedCollector.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/connector/TestFailedCollector.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/controller/TestAgentClient.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/controller/TestAgentClient.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/controller/TestAgentClient.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/controller/TestAgentClient.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestAcksOnFailure.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestAcksOnFailure.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestAcksOnFailure.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestAcksOnFailure.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/sender/TestRetryListOfCollectors.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaParquetWriter.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaParquetWriter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaParquetWriter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaParquetWriter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaWriters.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaWriters.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaWriters.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestChukwaWriters.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestClientAck.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestClientAck.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestClientAck.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestClientAck.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestSocketTee.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestSocketTee.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestSocketTee.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/TestSocketTee.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/solr/TestSolrWriter.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/solr/TestSolrWriter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/solr/TestSolrWriter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/solr/TestSolrWriter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/test/demux/TextParser.java b/core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/test/demux/TextParser.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/datacollection/writer/test/demux/TextParser.java
rename to core/src/test/java/org/apache/hadoop/chukwa/datacollection/writer/test/demux/TextParser.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/dataloader/TestDatabaseMetricDataLoader.java b/core/src/test/java/org/apache/hadoop/chukwa/dataloader/TestDatabaseMetricDataLoader.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/dataloader/TestDatabaseMetricDataLoader.java
rename to core/src/test/java/org/apache/hadoop/chukwa/dataloader/TestDatabaseMetricDataLoader.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java b/core/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java
rename to core/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/MockTriggerAction.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/MockTriggerAction.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/MockTriggerAction.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/MockTriggerAction.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemux.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemux.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemux.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemux.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxMapperConfigs.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxMapperConfigs.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxMapperConfigs.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxMapperConfigs.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxReducerConfigs.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxReducerConfigs.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxReducerConfigs.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxReducerConfigs.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestPostDemuxTrigger.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestPostDemuxTrigger.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestPostDemuxTrigger.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestPostDemuxTrigger.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaTestOutputCollector.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaTestOutputCollector.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaTestOutputCollector.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/ChukwaTestOutputCollector.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MockMapProcessor.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MockMapProcessor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MockMapProcessor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/MockMapProcessor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestAbtractProcessor.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestAbtractProcessor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestAbtractProcessor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestAbtractProcessor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestHadoopLogProcessor.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestHadoopLogProcessor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestHadoopLogProcessor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestHadoopLogProcessor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJsonProcessors.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJsonProcessors.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJsonProcessors.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJsonProcessors.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestLog4JMetricsContextChukwaRecord.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestLog4JMetricsContextChukwaRecord.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestLog4JMetricsContextChukwaRecord.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestLog4JMetricsContextChukwaRecord.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestTsProcessor.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestTsProcessor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestTsProcessor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestTsProcessor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MockReduceProcessor.java b/core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MockReduceProcessor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MockReduceProcessor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/reducer/MockReduceProcessor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/hicc/AreaCalculatorTest.java b/core/src/test/java/org/apache/hadoop/chukwa/hicc/AreaCalculatorTest.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/hicc/AreaCalculatorTest.java
rename to core/src/test/java/org/apache/hadoop/chukwa/hicc/AreaCalculatorTest.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/hicc/TestChart.java b/core/src/test/java/org/apache/hadoop/chukwa/hicc/TestChart.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/hicc/TestChart.java
rename to core/src/test/java/org/apache/hadoop/chukwa/hicc/TestChart.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/inputtools/TestInputFormat.java b/core/src/test/java/org/apache/hadoop/chukwa/inputtools/TestInputFormat.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/inputtools/TestInputFormat.java
rename to core/src/test/java/org/apache/hadoop/chukwa/inputtools/TestInputFormat.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePluginTest.java b/core/src/test/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePluginTest.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePluginTest.java
rename to core/src/test/java/org/apache/hadoop/chukwa/inputtools/hdfsusage/HDFSUsagePluginTest.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java b/core/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java
rename to core/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java b/core/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java
rename to core/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java b/core/src/test/java/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java
rename to core/src/test/java/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/rest/resource/TestClientTrace.java b/core/src/test/java/org/apache/hadoop/chukwa/rest/resource/TestClientTrace.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/rest/resource/TestClientTrace.java
rename to core/src/test/java/org/apache/hadoop/chukwa/rest/resource/TestClientTrace.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/tools/backfilling/TestBackfillingLoader.java b/core/src/test/java/org/apache/hadoop/chukwa/tools/backfilling/TestBackfillingLoader.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/tools/backfilling/TestBackfillingLoader.java
rename to core/src/test/java/org/apache/hadoop/chukwa/tools/backfilling/TestBackfillingLoader.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/DriverManagerUtilTest.java b/core/src/test/java/org/apache/hadoop/chukwa/util/DriverManagerUtilTest.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/DriverManagerUtilTest.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/DriverManagerUtilTest.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestCRValidator.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestCRValidator.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestCRValidator.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestCRValidator.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestCopySequenceFile.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestCopySequenceFile.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestCopySequenceFile.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestCopySequenceFile.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestCreateRecordFile.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestCreateRecordFile.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestCreateRecordFile.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestCreateRecordFile.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestDumpChunks.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestDumpChunks.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestDumpChunks.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestDumpChunks.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestFilter.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestFilter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestFilter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestFilter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestRecordConsts.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestRecordConsts.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestRecordConsts.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestRecordConsts.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/util/TestXSSFilter.java b/core/src/test/java/org/apache/hadoop/chukwa/util/TestXSSFilter.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/util/TestXSSFilter.java
rename to core/src/test/java/org/apache/hadoop/chukwa/util/TestXSSFilter.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/DemuxDirectoryValidator.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/DemuxDirectoryValidator.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/DemuxDirectoryValidator.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/DemuxDirectoryValidator.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkDumper.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkDumper.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkDumper.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkDumper.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkQueueInterceptor.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkQueueInterceptor.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkQueueInterceptor.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/ChunkQueueInterceptor.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/SetupTestClasses.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/SetupTestClasses.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/SetupTestClasses.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/interceptor/SetupTestClasses.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/util/DataOperations.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/util/DataOperations.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/util/DataOperations.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/util/DataOperations.java
diff --git a/src/test/java/org/apache/hadoop/chukwa/validationframework/util/MD5.java b/core/src/test/java/org/apache/hadoop/chukwa/validationframework/util/MD5.java
similarity index 100%
rename from src/test/java/org/apache/hadoop/chukwa/validationframework/util/MD5.java
rename to core/src/test/java/org/apache/hadoop/chukwa/validationframework/util/MD5.java
diff --git a/src/test/resources/Hadoop18JobHistoryLog.txt b/core/src/test/resources/Hadoop18JobHistoryLog.txt
similarity index 100%
rename from src/test/resources/Hadoop18JobHistoryLog.txt
rename to core/src/test/resources/Hadoop18JobHistoryLog.txt
diff --git a/src/test/resources/TestJobLog.txt b/core/src/test/resources/TestJobLog.txt
similarity index 100%
rename from src/test/resources/TestJobLog.txt
rename to core/src/test/resources/TestJobLog.txt
diff --git a/src/test/resources/hbase-site.xml b/core/src/test/resources/hbase-site.xml
similarity index 100%
rename from src/test/resources/hbase-site.xml
rename to core/src/test/resources/hbase-site.xml
diff --git a/src/test/resources/late-log4j.properties b/core/src/test/resources/late-log4j.properties
similarity index 100%
rename from src/test/resources/late-log4j.properties
rename to core/src/test/resources/late-log4j.properties
diff --git a/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/src/test/resources/solr.xml b/core/src/test/resources/solr.xml
similarity index 100%
rename from src/test/resources/solr.xml
rename to core/src/test/resources/solr.xml
diff --git a/src/test/resources/tasklog-log4j.properties b/core/src/test/resources/tasklog-log4j.properties
similarity index 100%
rename from src/test/resources/tasklog-log4j.properties
rename to core/src/test/resources/tasklog-log4j.properties
diff --git a/test/samples/ClientTrace.log b/core/test/samples/ClientTrace.log
similarity index 100%
rename from test/samples/ClientTrace.log
rename to core/test/samples/ClientTrace.log
diff --git a/test/samples/Iostat.log b/core/test/samples/Iostat.log
similarity index 100%
rename from test/samples/Iostat.log
rename to core/test/samples/Iostat.log
diff --git a/test/samples/JobHistory.log b/core/test/samples/JobHistory.log
similarity index 100%
rename from test/samples/JobHistory.log
rename to core/test/samples/JobHistory.log
diff --git a/tools/expire.sh b/core/tools/expire.sh
similarity index 100%
rename from tools/expire.sh
rename to core/tools/expire.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..43ef621
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,69 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FROM centos:7
+MAINTAINER Apache
+ENV container docker
+
+RUN yum -y update && yum clean all
+
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*;\
+rm -f /etc/systemd/system/*.wants/*;\
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*;\
+rm -f /lib/systemd/system/anaconda.target.wants/*; \
+rm -f /run/nologin
+
+
+RUN yum install -y net-tools tar wget bind-utils ntpd java-1.8.0-openjdk which openssh-server openssh-clients lsof
+RUN yum -y install epel-release java-1.8.0-openjdk-devel.x86_64
+RUN yum groupinstall -y 'Development Tools'
+RUN yum install -y protobuf-devel leveldb-devel snappy-devel opencv-devel boost-devel hdf5-devel
+RUN yum install -y gflags-devel glog-devel lmdb-devel
+RUN yum install -y gcc gcc-c++ numpy scipy cmake git python-devel
+RUN yum install -y openblas openblas-devel atlas-devel
+
+RUN mkdir -p /opt/apache
+
+RUN mkdir -p /opt/apache/zookeeper && \
+    curl -SL https://www.apache.org/dist/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz | \
+    tar -xzC /opt/apache/zookeeper --strip 1
+RUN mkdir -p /opt/apache/hadoop && \
+    curl -SL https://www.apache.org/dist/hadoop/common/hadoop-3.1.1/hadoop-3.1.1.tar.gz | \
+    tar -xzC /opt/apache/hadoop --strip 1
+RUN mkdir -p /opt/apache/hbase && \
+    curl -SL https://www.apache.org/dist/hbase/1.4.9/hbase-1.4.9-bin.tar.gz | \
+    tar -xzC /opt/apache/hbase --strip 1
+RUN mkdir -p /opt/apache/solr && \
+    curl -SL https://www.apache.org/dist/lucene/solr/5.5.5/solr-5.5.5.tgz | \
+    tar -xzC /opt/apache/solr --strip 1
+ADD target/chukwa-core-0.8.0.tar.gz /opt/apache
+RUN rm -f chukwa-core*.tar.gz
+RUN ln -s /opt/apache/chukwa-* /opt/apache/chukwa
+RUN cp -f /opt/apache/chukwa/etc/chukwa/hadoop-log4j.properties /opt/apache/hadoop/etc/hadoop/log4j.properties
+RUN cp -f /opt/apache/chukwa/etc/chukwa/hadoop-metrics2.properties /opt/apache/hadoop/etc/hadoop/hadoop-metrics2.properties
+RUN cp -f /opt/apache/chukwa/etc/chukwa/hadoop-metrics2-hbase.properties /opt/apache/hbase/conf/hadoop-metrics2-hbase.properties
+RUN cp -f /opt/apache/chukwa/etc/chukwa/hbase-log4j.properties /opt/apache/hbase/conf/log4j.properties
+ADD hadoop/* /opt/apache/hadoop/etc/hadoop/
+ADD hbase/* /opt/apache/hbase/conf/
+ADD start-all.sh /etc/start-all.sh
+ADD setup-image.sh /
+
+EXPOSE 4080 50070 8088 16010 7574
+
+CMD [ "/usr/lib/systemd/systemd" ]
+
diff --git a/contrib/docker/README b/docker/README
similarity index 100%
rename from contrib/docker/README
rename to docker/README
diff --git a/contrib/docker/hadoop/core-site.xml b/docker/hadoop/core-site.xml
similarity index 100%
rename from contrib/docker/hadoop/core-site.xml
rename to docker/hadoop/core-site.xml
diff --git a/contrib/docker/hadoop/hadoop-env.sh b/docker/hadoop/hadoop-env.sh
similarity index 100%
rename from contrib/docker/hadoop/hadoop-env.sh
rename to docker/hadoop/hadoop-env.sh
diff --git a/contrib/docker/hadoop/mapred-site.xml b/docker/hadoop/mapred-site.xml
similarity index 100%
rename from contrib/docker/hadoop/mapred-site.xml
rename to docker/hadoop/mapred-site.xml
diff --git a/contrib/docker/hadoop/yarn-env.sh b/docker/hadoop/yarn-env.sh
similarity index 100%
rename from contrib/docker/hadoop/yarn-env.sh
rename to docker/hadoop/yarn-env.sh
diff --git a/contrib/docker/hadoop/yarn-site.xml b/docker/hadoop/yarn-site.xml
similarity index 100%
rename from contrib/docker/hadoop/yarn-site.xml
rename to docker/hadoop/yarn-site.xml
diff --git a/contrib/docker/hbase/hbase-env.sh b/docker/hbase/hbase-env.sh
similarity index 100%
rename from contrib/docker/hbase/hbase-env.sh
rename to docker/hbase/hbase-env.sh
diff --git a/contrib/docker/hbase/hbase-site.xml b/docker/hbase/hbase-site.xml
similarity index 100%
rename from contrib/docker/hbase/hbase-site.xml
rename to docker/hbase/hbase-site.xml
diff --git a/contrib/docker/makeImage.sh b/docker/makeImage.sh
similarity index 100%
rename from contrib/docker/makeImage.sh
rename to docker/makeImage.sh
diff --git a/docker/pom.xml b/docker/pom.xml
new file mode 100644
index 0000000..d3d92c3
--- /dev/null
+++ b/docker/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <name>Apache Chukwa Docker Image</name>
+    <description>Chukwa Docker Image is binary distribution of Chukwa to run in Apache Hadoop.</description>
+
+    <url>http://chukwa.apache.org/</url>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.chukwa</groupId>
+    <artifactId>chukwa-docker</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.apache.chukwa</groupId>
+        <version>0.8.0</version>
+        <artifactId>chukwa</artifactId>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.chukwa</groupId>
+                                    <artifactId>chukwa-core</artifactId>
+                                    <version>${project.version}</version>
+                                    <destFileName>chukwa-core-${project.version}.tar.gz</destFileName>
+                                    <type>tar.gz</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.3.4</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>chukwa/chukwa</repository>
+                    <tag>${project.version}</tag>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/contrib/docker/setup-image.sh b/docker/setup-image.sh
similarity index 100%
rename from contrib/docker/setup-image.sh
rename to docker/setup-image.sh
diff --git a/contrib/docker/start-all.sh b/docker/start-all.sh
similarity index 97%
copy from contrib/docker/start-all.sh
copy to docker/start-all.sh
index bfb214a..732b4bb 100755
--- a/contrib/docker/start-all.sh
+++ b/docker/start-all.sh
@@ -39,4 +39,4 @@
 echo "Username: admin, password: admin"
 echo
 echo "Enjoy!"
-bash
+chukwa --config /etc/chukwa hicc
diff --git a/forrest.properties b/forrest.properties
deleted file mode 100644
index ac436d1..0000000
--- a/forrest.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-##############
-# These are the defaults, un-comment them only if you need to change them.
-#
-# You can even have a completely empty file, to assist with maintenance.
-# This file is required, even if empty.
-#
-# The file obtained from 'forrest seed-sample' shows the defaults.
-##############
-
-# Prints out a summary of Forrest settings for this project
-#forrest.echo=true
-
-# Project name (used to name .war file)
-#project.name=my-project
-
-# Specifies name of Forrest skin to use
-# See list at http://forrest.apache.org/docs/skins.html
-#project.skin=pelt
-
-# codename: Dispatcher
-# Dispatcher is using a fallback mechanism for theming.
-# You can configure the theme name and its extension here
-#project.theme-extension=.fv
-#project.theme=pelt
-
-
-# Descriptors for plugins and skins
-# comma separated list, file:// is supported
-#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
-#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
-
-##############
-# behavioural properties
-#project.menu-scheme=tab_attributes
-#project.menu-scheme=directories
-
-##############
-# layout properties
-
-# Properties that can be set to override the default locations
-#
-# Parent properties must be set. This usually means uncommenting
-# project.content-dir if any other property using it is uncommented
-
-#project.status=status.xml
-#project.content-dir=src/documentation
-#project.raw-content-dir=${project.content-dir}/content
-#project.conf-dir=${project.content-dir}/conf
-#project.sitemap-dir=${project.content-dir}
-#project.xdocs-dir=${project.content-dir}/content/xdocs
-#project.resources-dir=${project.content-dir}/resources
-#project.stylesheets-dir=${project.resources-dir}/stylesheets
-#project.images-dir=${project.resources-dir}/images
-#project.schema-dir=${project.resources-dir}/schema
-#project.skins-dir=${project.content-dir}/skins
-#project.skinconf=${project.content-dir}/skinconf.xml
-#project.lib-dir=${project.content-dir}/lib
-#project.classes-dir=${project.content-dir}/classes
-#project.translations-dir=${project.content-dir}/translations
-
-#project.build-dir=${project.home}/build
-#project.site=site
-#project.site-dir=${project.build-dir}/${project.site}
-#project.temp-dir=${project.build-dir}/tmp
-
-##############
-# Cocoon catalog entity resolver properties
-# A local OASIS catalog file to supplement the default Forrest catalog
-#project.catalog=${project.schema-dir}/catalog.xcat
-
-##############
-# validation properties
-
-# This set of properties determine if validation is performed
-# Values are inherited unless overridden.
-# e.g. if forrest.validate=false then all others are false unless set to true.
-#forrest.validate=true
-#forrest.validate.xdocs=${forrest.validate}
-#forrest.validate.skinconf=${forrest.validate}
-#forrest.validate.sitemap=${forrest.validate}
-#forrest.validate.stylesheets=${forrest.validate}
-#forrest.validate.skins=${forrest.validate}
-#forrest.validate.skins.stylesheets=${forrest.validate.skins}
-
-# *.failonerror=(true|false) - stop when an XML file is invalid
-#forrest.validate.failonerror=true
-
-# *.excludes=(pattern) - comma-separated list of path patterns to not validate
-# Note: If you do add an "excludes" list then you need to specify site.xml too.
-# e.g.
-#forrest.validate.xdocs.excludes=site.xml, samples/subdir/**, samples/faq.xml
-#forrest.validate.xdocs.excludes=site.xml
-
-
-##############
-# General Forrest properties
-
-# The URL to start crawling from
-#project.start-uri=linkmap.html
-
-# Set logging level for messages printed to the console
-# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
-#project.debuglevel=ERROR
-
-# Max memory to allocate to Java
-#forrest.maxmemory=64m
-
-# Any other arguments to pass to the JVM. For example, to run on an X-less
-# server, set to -Djava.awt.headless=true
-#forrest.jvmargs=
-
-# The bugtracking URL - the issue number will be appended
-# Projects would use their own issue tracker, of course.
-#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
-#project.bugtracking-url=http://issues.apache.org/jira/browse/
-
-# The issues list as rss
-#project.issues-rss-url=
-
-#I18n Property. Based on the locale request for the browser.
-#If you want to use it for static site then modify the JVM system.language
-# and run once per language
-#project.i18n=false
-
-# The names of plugins that are required to build the project
-# comma separated list (no spaces)
-# You can request a specific version by appending "-VERSION" to the end of
-# the plugin name. If you exclude a version number, the latest released version
-# will be used. However, be aware that this may be a development version. In
-# a production environment it is recommended that you specify a known working
-# version.
-# Run "forrest available-plugins" for a list of plug-ins currently available.
-
-project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.simplifiedDocbook
-
-
-# codename: Dispatcher
-# Add the following plugins to project.required.plugins:
-#org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule
-
-# Proxy configuration
-# - proxy.user and proxy.password are only needed if the proxy is an authenticated one...
-# proxy.host=myproxy.myhost.com
-# proxy.port=<ProxyPort, if not the default : 80>
-# proxy.user=<login, if authenticated proxy>
-# proxy.password=<password, if authenticated proxy>
diff --git a/pom.xml b/pom.xml
index 05ae418..898f826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <groupId>org.apache.chukwa</groupId>
     <version>0.8.0</version>
     <artifactId>chukwa</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
 
     <issueManagement>
         <system>Chukwa JIRA</system>
@@ -411,612 +411,14 @@
         <url>http://www.apache.org/</url>
     </organization>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/main/web/hicc</directory>
-                <includes>
-                    <include>/WEB-INF/jetty.xml</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>copy-configuration</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/conf</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>conf</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <executions>
-                    <execution>
-                        <id>core</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test</id>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>client</id>
-                        <configuration>
-                            <classifier>client</classifier>
-                            <includes>
-                                <include>**/inputtools/log4j/**/*</include>
-                                <include>**/datacollection/client/**/*</include>
-                                <include>**/chukwa/util/**/*</include>
-                                <include>**/chukwa/datacollection/controller/**/*</include>
-                            </includes>
-                        </configuration>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <executions>
-                  <execution>
-                    <id>default-compile</id>
-                    <phase>compile</phase>
-                    <configuration>
-                      <goals>
-                        <goal>compile</goal>
-                      </goals>
-                      <compilerVersion>1.7</compilerVersion>
-                      <source>1.7</source>
-                      <target>1.7</target>
-                      <excludes>
-                        <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
-                      </excludes>
-                    </configuration>
-                  </execution>
-                  <execution>
-                    <id>default-testCompile</id>
-                    <phase>test-compile</phase>
-                    <configuration>
-                      <goals>
-                        <goal>testCompile</goal>
-                      </goals>
-                      <compilerVersion>${javaVersion}</compilerVersion>
-                      <source>${javaVersion}</source>
-                      <target>${javaVersion}</target>
-                      <testExcludes>
-                        <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
-                        <exclude>**/TestDemuxManager.java</exclude>
-                        <exclude>**/TestFSMBuilder.java</exclude>
-                      </testExcludes>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <argLine>-Xmx1024m -Djava.net.preferIPv4Stack=true -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=${basedir}/target/conf/jmxremote.password -Dcom.sun.management.jmxremote.access.file=${basedir}/target/conf/jmxremote.access -Dcom.sun.management.jmxremote.port=10100</argLine>
-                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
-                            <forkMode>pertest</forkMode>
-                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                            <includes>
-                                <include>**/Test*.java</include>
-                            </includes>
-                            <excludes>
-							    <exclude>**/TestMemoryUsageDetection.java</exclude>
-                                <exclude>**/TestFSMBuilder.java</exclude>
-                                <exclude>**/TestDatabase*.java</exclude>
-                                <exclude>**/TestArchive.java</exclude>
-                                <exclude>**/TestJobLogEntry.java</exclude>
-                                <exclude>**/*$*</exclude>
-			   	<exclude>**/TestClientTrace.java</exclude>
-                            </excludes>
-                            <systemPropertyVariables>
-                                <test.build.dir>${project.build.directory}/test</test.build.dir>
-                                <test.build.data>${project.build.directory}/test/var</test.build.data>
-                                <test.cache.data>${project.build.directory}/test/var/cache</test.cache.data>
-                                <test.debug.data>${project.build.directory}/test/var/debug</test.debug.data>
-                                <test.log.dir>${project.build.directory}/test/var/log</test.log.dir>
-                                <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
-                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
-                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
-                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
-                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
-                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
-                                <CHUKWA_HOME>${project.build.directory}/test</CHUKWA_HOME>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
-                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
-                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
-                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
-                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
-                                <CHUKWA_HOME>${project.build.directory}/test</CHUKWA_HOME>
-                            </environmentVariables>
-                            <workingDirectory>${project.build.directory}/test-classes</workingDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                            <argLine>-Xmx1024m</argLine>
-                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
-                            <forkMode>pertest</forkMode>
-                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                            <includes>
-                                <include>**/TestFSMBuilder.java</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/TestDatabase*.java</exclude>
-                                <exclude>**/TestArchive.java</exclude>
-                                <exclude>**/*$*</exclude>
-                            </excludes>
-                            <systemPropertyVariables>
-                                <test.build.data>${project.build.directory}/test/var</test.build.data>
-                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
-                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
-                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
-                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
-                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
-                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <CHUKWA_LOG_DIR>${project.build.directory}/test/var/log</CHUKWA_LOG_DIR>
-                                <CHUKWA_CONF_DIR>${project.build.directory}/test/conf</CHUKWA_CONF_DIR>
-                                <CHUKWA_DATA_DIR>${project.build.directory}/test/var</CHUKWA_DATA_DIR>
-                                <CHUKWA_PID_DIR>${project.build.directory}/test/var/pid</CHUKWA_PID_DIR>
-                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
-                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
-                            </environmentVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
-                <configuration>
-                    <phase>package</phase>
-                    <warName>hicc</warName>
-                    <warSourceDirectory>src/main/web/hicc</warSourceDirectory>
-                    <webappDirectory>${project.build.directory}/hicc</webappDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-hicc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>war</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>build-tarball</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${final.name}</finalName>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <descriptors>
-                                <descriptor>src/packages/tarball/all.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>setup</id>
-                        <phase>validate</phase>
-                        <configuration>
-                            <target>
-                                <mkdir dir="${basedir}/target"/>
-                                <echo message="${VERSION}" file="${basedir}/target/VERSION"/>
-                                <mkdir dir="${basedir}/target/clover"/>
-                                <chmod dir="${basedir}/target/clover" perm="a+w" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>chmod-jmx-file</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <target>
-                                <chmod file="${project.build.directory}/conf/jmxremote.password" perm="600" />
-                                <chmod file="${project.build.directory}/conf/jmxremote.access" perm="600" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test-setup</id>
-                        <phase>generate-test-resources</phase>
-                        <configuration>
-                            <target>
-                                <delete dir="${project.build.directory}/test" />
-                                <mkdir dir="${project.build.directory}/test/conf" />
-                                <mkdir dir="${project.build.directory}/test/var" />
-                                <mkdir dir="${project.build.directory}/test/var/log" />
-                                <mkdir dir="${project.build.directory}/test/var/run" />
-                                <copy todir="${project.build.directory}/test/var/log">
-                                    <fileset dir="${basedir}/test/samples/">
-                                        <include name="*.log" />
-                                    </fileset>
-                                </copy>
-                                <echo message="localhost" file="${project.build.directory}/test/conf/collectors"/>
-                                <copy file="${basedir}/conf/chukwa-common.xml" tofile="${project.build.directory}/test/conf/chukwa-common.xml">
-                                    <filterchain>
-                                        <expandproperties/>
-                                    </filterchain>
-                                </copy>
-                                <copy file="${basedir}/conf/chukwa-agent-conf.xml" tofile="${project.build.directory}/test/conf/chukwa-agent-conf.xml">
-                                    <filterchain>
-                                        <expandproperties/>
-                                    </filterchain>
-                                </copy>
-                                <copy file="${basedir}/conf/chukwa-demux-conf.xml" tofile="${project.build.directory}/test/conf/chukwa-demux-conf.xml">
-                                    <filterchain>
-                                        <expandproperties/>
-                                    </filterchain>
-                                </copy>
-                                <copy file="${basedir}/conf/jmxremote.password" tofile="${project.build.directory}/test/conf/jmxremote.password">
-                                    <filterchain>
-                                        <expandproperties/>
-                                    </filterchain>
-                                </copy>
-                                <copy file="${basedir}/conf/jmxremote.password" tofile="${project.build.directory}/test/conf/jmxremote.access">
-                                    <filterchain>
-                                        <expandproperties/>
-                                    </filterchain>
-                                </copy>
-                                <copy file="${basedir}/conf/log4j.properties" tofile="${project.build.directory}/test/conf/log4j.properties"></copy>
-                                <copy file="${basedir}/conf/auth.conf" tofile="${project.build.directory}/test/conf/auth.conf"></copy>
-                                <chmod file="${project.build.directory}/test/conf/jmxremote.password" perm="600" />
-                                <chmod file="${project.build.directory}/test/conf/jmxremote.access" perm="600" />
-                                <copy file="${basedir}/src/test/resources/solr.xml" tofile="${project.build.directory}/test/var/solr.xml"></copy>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>pre-site</id>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/site" />
-                                <mkdir dir="${basedir}/target/site/apidocs"/>
-                                <exec executable="perl" input="CHANGES.txt" output="${project.build.directory}/site/changes.html" failonerror="true">
-                                    <arg value="src/site/resources/scripts/changes2html.pl" />
-                                </exec>
-                                <copy todir="${project.build.directory}/site">
-                                    <fileset dir="src/site/resources/css" includes="*.css" />
-                                </copy>
-                                <copy todir="${project.build.directory}/site/css">
-                                    <fileset dir="src/main/web/hicc/css" includes="*" />
-                                </copy>
-                                <copy todir="${project.build.directory}/site/js">
-                                    <fileset dir="src/main/web/hicc/js" includes="*" />
-                                </copy>
-                                <copy todir="${project.build.directory}/site/fonts">
-                                    <fileset dir="src/main/web/hicc/fonts" includes="*" />
-                                </copy>
-                                <copy file="src/main/web/hicc/welcome.html" tofile="${project.build.directory}/site/hicc.html" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>0.11</version>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                  <numUnapprovedLicenses>0</numUnapprovedLicenses>
-                  <excludes>
-  			            <!-- notice files -->
-  			            <exclude>CHANGES.txt</exclude>
-  			            <exclude>README.md</exclude>
-
-  			            <!-- generated files -->
-  			            <exclude>bin/VERSION</exclude>
-  			            <exclude>**/target/**</exclude>
-  			            <exclude>**/.classpath</exclude>
-  			            <exclude>**/.project</exclude>
-  			            <exclude>**/.settings/**</exclude>
-
-  			            <!-- Data files -->
-  			            <exclude>conf/agents</exclude>
-  			            <exclude>conf/alert</exclude>
-  			            <exclude>conf/auth.conf</exclude>
-  			            <exclude>conf/collectors</exclude>
-  			            <exclude>conf/hbase.schema</exclude>
-  			            <exclude>conf/initial_adaptors</exclude>
-  			            <exclude>conf/jmxremote.access</exclude>
-  			            <exclude>conf/jmxremote.password</exclude>
-  			            <exclude>contrib/solr/logs/conf/_schema_analysis_stopwords_english.json</exclude>
-  			            <exclude>contrib/solr/logs/conf/_schema_analysis_synonyms_english.json</exclude>
-  			            <exclude>src/main/web/hicc/descriptors/**</exclude>
-  			            <exclude>src/main/web/hicc/views/**</exclude>
-
-  			            <!-- Test samples -->
-  			            <exclude>src/test/resources/Hadoop18JobHistoryLog.txt</exclude>
-  			            <exclude>src/test/resources/TestJobLog.txt</exclude>
-  			            <exclude>test/samples/ClientTrace.log</exclude>
-  			            <exclude>test/samples/Iostat.log</exclude>
-  			            <exclude>test/samples/JobHistory.log</exclude>
-
-  			            <!-- bsd licensed files -->
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_da.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_de.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_es.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fa.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fi.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_fr.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_hi.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_hu.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_it.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_nl.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_no.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_pt.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_ru.txt</exclude>
-  			            <exclude>contrib/solr/logs/conf/lang/stopwords_sv.txt</exclude>
-  			            <exclude>src/main/web/hicc/js/jquery*</exclude>
-  			            <exclude>src/main/web/hicc/home/js/jquery.js</exclude>
-                    <exclude>src/main/web/hicc/css/jquery.circliful.css</exclude>
-  			            <exclude>src/main/web/hicc/css/iui.css</exclude>
-  			            <exclude>src/main/web/hicc/js/behaviour.js</exclude>
-  			            <exclude>src/main/web/hicc/js/heatmap.js</exclude>
-  			            <exclude>src/main/web/hicc/js/iui.js</exclude>
-  			            <exclude>src/main/web/hicc/js/yahoo-dom-event.js</exclude>
-  			            <exclude>src/main/web/hicc/js/treeview-min.js</exclude>
-                    <exclude>src/main/resources/ESAPI.properties</exclude>
-
-  			            <!-- MIT licensed files -->
-  			            <exclude>contrib/solr/logs/conf/velocity/jquery.autocomplete.js</exclude>
-  			            <exclude>src/main/web/hicc/css/flexigrid/flexigrid.css</exclude>
-  			            <exclude>src/main/web/hicc/css/timeline.css</exclude>
-  			            <exclude>src/main/web/hicc/lib/timeline/**</exclude>
-  			            <exclude>lib/agent.dict</exclude>
-  			            <exclude>lib/collector.dict</exclude>
-  			            <exclude>lib/confspellcheck-README</exclude>
-  			            <exclude>lib/json-README.txt</exclude>
-  			            <exclude>src/main/web/hicc/js/ajaxtree.js</exclude>
-  			            <exclude>src/main/web/hicc/js/flexigrid.js</exclude>
-  			            <exclude>src/main/web/hicc/js/flexigrid.pack.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/builder.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/controls.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/dragdrop.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/effects.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/scriptaculous.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/slider.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/sound.js</exclude>
-  			            <exclude>src/main/web/hicc/js/org/tool-man/*</exclude>
-  			            <exclude>src/main/web/hicc/js/timeframe.js</exclude>
-  			            <exclude>src/main/web/hicc/js/workspace/prototype.js</exclude>
-  			            <exclude>src/main/web/hicc/js/jquery.flot.pack.js</exclude>
-  			            <exclude>src/main/web/hicc/js/gsv.js</exclude>
-  			            <exclude>src/main/web/hicc/js/bootstrap.min.js</exclude>
-  			            <exclude>src/main/web/hicc/js/js-cookie.js</exclude>
-  			            <exclude>src/main/web/hicc/css/bootstrap-theme.css.map</exclude>
-  			            <exclude>src/main/web/hicc/css/bootstrap-theme.min.css</exclude>
-  			            <exclude>src/main/web/hicc/css/bootstrap.min.css</exclude>
-  			            <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.svg</exclude>
-  			            <exclude>src/main/web/hicc/home/js/jquery.gridster.min.js</exclude>
-  			            <exclude>src/main/web/hicc/home/js/jquery.gridster.with-extras.min.js</exclude>
-  			            <exclude>src/main/web/hicc/home/css/jquery.gridster.css</exclude>
-  			            <exclude>src/main/web/hicc/home/css/jquery.gridster.min.css</exclude>
-  			            <exclude>src/main/web/hicc/home/js/typeahead.bundle.js</exclude>
-  			            <exclude>src/main/web/hicc/home/js/classie.js</exclude>
-  			            <exclude>src/main/web/hicc/home/js/gnmenu.js</exclude>
-  			            <exclude>src/main/web/hicc/home/js/modernizr.custom.js</exclude>
-                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.min.css</exclude>
-                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.structure.min.css</exclude>
-                    <exclude>src/main/web/hicc/ajax-solr/chukwa/css/jquery-ui.theme.min.css</exclude>
-                    <exclude>src/main/web/hicc/ajax-solr/chukwa/js/jquery-ui.min.js</exclude>
-                    <exclude>src/main/web/hicc/ajax-solr/chukwa/js/require.min.js</exclude>
-                    <exclude>src/main/web/hicc/home/css/select2.min.css</exclude>
-                    <exclude>src/main/web/hicc/home/js/select2.min.js</exclude>
-                    <exclude>src/main/web/hicc/css/font-awesome.min.css</exclude>
-                    <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.*</exclude>
-                    <exclude>src/main/web/hicc/home/css/gridstack.min.css</exclude>
-                    <exclude>src/main/web/hicc/home/js/gridstack.min.*</exclude>
-                    <exclude>src/main/web/hicc/home/js/jquery-ui.js</exclude>
-
-  			            <!-- Creative Commons licensed files -->
-  			            <exclude>src/main/web/hicc/js/autoHeight.js</exclude>
-
-  			            <!-- Public Domain -->
-  			            <exclude>src/main/web/hicc/js/base64.js</exclude>
-  			            <exclude>src/main/web/hicc/js/canvas2image.js</exclude>
-  			            <exclude>src/main/web/hicc/js/json.js</exclude>
-  			            <exclude>src/main/web/hicc/home/fonts/codropsicons/*</exclude>
-  			            <exclude>src/main/web/hicc/home/fonts/ecoicons/*</exclude>
-                                    <exclude>src/main/web/hicc/home/js/lodash.min.js</exclude>
-
-                    <!-- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 -->
-                    <exclude>src/main/web/hicc/css/chartist.css</exclude>
-                    <exclude>src/main/web/hicc/css/chartist.css.map</exclude>
-                    <exclude>src/main/web/hicc/js/chartist.min.js</exclude>
-                    <exclude>src/main/web/hicc/js/chartist.min.js.map</exclude>                    
-                    <exclude>src/main/resources/chukwachunk.json</exclude>                    
-                  </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-        <extensions>
-          <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh-external</artifactId>
-            <version>1.0</version>
-          </extension>
-        </extensions>
-        <pluginManagement>
-          <plugins>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-            <plugin>
-              <groupId>org.eclipse.m2e</groupId>
-              <artifactId>lifecycle-mapping</artifactId>
-              <version>1.0.0</version>
-              <configuration>
-                <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <versionRange>[2.10.1,)</versionRange>
-                        <goals>
-                          <goal>javadoc</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore></ignore>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>com.sun.jersey.contribs</groupId>
-                        <artifactId>maven-wadl-plugin</artifactId>
-                        <versionRange>[1.8,)</versionRange>
-                        <goals>
-                          <goal>generate</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore></ignore>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <versionRange>[1.6,)</versionRange>
-                        <goals>
-                          <goal>run</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore></ignore>
-                      </action>
-                    </pluginExecution>
-                  </pluginExecutions>
-                </lifecycleMappingMetadata>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-    </build>
+    <modules>
+        <module>core</module>
+        <module>docker</module>
+        <module>analyzer</module>
+    </modules>
 
     <profiles>
         <profile>
-            <id>hudson</id>
-            <activation>
-                <property>
-                    <name>!env.BUILD_NUMBER</name>
-                </property>
-            </activation>
-            <properties>
-                <BUILD_NUMBER>0</BUILD_NUMBER>
-            </properties>
-        </profile>
-        <profile>
             <id>src</id>
             <activation>
                 <property>
@@ -1054,282 +456,6 @@
                 </plugins>
             </build>
         </profile>
-        
-        <profile>
-            <id>hbase-1</id>
-            <activation>
-                <property>
-                    <name>!hbase.profile</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-common</artifactId>
-                    <version>${hbaseVersion}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-server</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-json</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-hdfs</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-auth</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-client</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-mapreduce-client-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-yarn-common</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-client</artifactId>
-                    <version>${hbaseVersion}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-server</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-json</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-hdfs</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-server</artifactId>
-                    <version>${hbaseVersion}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-server</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-json</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.hadoop</groupId>
-                            <artifactId>hadoop-hdfs</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-common</artifactId>
-                    <classifier>tests</classifier>
-                    <version>${hbaseVersion}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-server</artifactId>
-                    <classifier>tests</classifier>
-                    <version>${hbaseVersion}</version>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-server</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-json</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
-                        </exclusion>
-                   </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-hadoop-compat</artifactId>
-                    <classifier>tests</classifier>
-                    <version>${hbaseVersion}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-hadoop2-compat</artifactId>
-                    <classifier>tests</classifier>
-                    <version>${hbaseVersion}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                    <version>${hadoopVersion}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.servlet.jsp</groupId>
-                            <artifactId>jsp-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.codehaus.jackson</groupId>
-                            <artifactId>jackson-mapper-asl</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-auth</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-server-tests</artifactId>
-                    <version>${hadoopVersion}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-	            <artifactId>hadoop-minicluster</artifactId>
-                    <version>${hadoopVersion}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-          <id>docs</id>
-          <activation>
-            <file>
-              <exists>/usr/bin/xsltproc</exists>
-            </file>
-          </activation>
-          <build>
-            <plugins>
-              <!--  Generate HTML version of REST API document  -->
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
-                <dependencies>
-                  <dependency><!-- add support for ssh/scp -->
-                    <groupId>org.apache.maven.wagon</groupId>
-                    <artifactId>wagon-ssh</artifactId>
-                    <version>1.0</version>
-                  </dependency>
-                </dependencies>
-              </plugin>
-            </plugins>
-          </build>
-          <dependencies>
-            <dependency>
-              <groupId>com.sun.jersey.contribs</groupId>
-              <artifactId>maven-wadl-plugin</artifactId>
-              <version>1.8</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.apache.maven</groupId>
-                  <artifactId>apache-maven</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.apache.maven</groupId>
-                  <artifactId>maven-artifact</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-              <groupId>com.sun.jersey.contribs</groupId>
-              <artifactId>wadl-resourcedoc-doclet</artifactId>
-              <version>1.8</version>
-            </dependency>
-          </dependencies>
-        </profile>
     </profiles>
 
     <repositories>